diff --git a/.gitignore b/.gitignore index 32121f62..390845c6 100644 --- a/.gitignore +++ b/.gitignore @@ -38,14 +38,14 @@ build/ .DS_Store /data/ /config/ -/src/test/java/memory/test.json -/src/test/java/memory/result/input1.json -/src/test/java/memory/result/input2.json -/src/test/java/memory/result/output1.json -/src/test/java/memory/result/output2.json -/src/test/java/memory/result/total_input.json -/src/test/java/memory/result/input3.json -/src/test/java/memory/result/input4.json -/src/test/java/memory/result/primary_input.json -/src/main/resources/prompt/module/memory/topic_extractor.json.bak +/Partner-Core/src/main/java/src/test/java/memory/test.json +/Partner-Core/src/main/java/src/test/java/memory/result/input1.json +/Partner-Core/src/main/java/src/test/java/memory/result/input2.json +/Partner-Core/src/main/java/src/test/java/memory/result/output1.json +/Partner-Core/src/main/java/src/test/java/memory/result/output2.json +/Partner-Core/src/main/java/src/test/java/memory/result/total_input.json +/Partner-Core/src/main/java/src/test/java/memory/result/input3.json +/Partner-Core/src/main/java/src/test/java/memory/result/input4.json +/Partner-Core/src/main/java/src/test/java/memory/result/primary_input.json +/Partner-Core/src/main/java/src/main/resources/prompt/module/memory/topic_extractor.json.bak /backup/ diff --git a/.idea/encodings.xml b/.idea/encodings.xml index aa00ffab..327c9df0 100644 --- a/.idea/encodings.xml +++ b/.idea/encodings.xml @@ -1,6 +1,12 @@ + + + + + + diff --git a/Partner-Capability-Demo/pom.xml b/Partner-Capability-Demo/pom.xml new file mode 100644 index 00000000..cc9723f6 --- /dev/null +++ b/Partner-Capability-Demo/pom.xml @@ -0,0 +1,20 @@ + + + 4.0.0 + + work.slhaf + Partner + 0.5.0 + + + Partner-Capability-Demo + + + 21 + 21 + UTF-8 + + + \ No newline at end of file diff --git a/Partner-Capability-Demo/src/main/java/work/slhaf/demo/MyCognationManager.java b/Partner-Capability-Demo/src/main/java/work/slhaf/demo/MyCognationManager.java new file mode 100644 index 00000000..ea352559 --- /dev/null +++ b/Partner-Capability-Demo/src/main/java/work/slhaf/demo/MyCognationManager.java @@ -0,0 +1,15 @@ +package work.slhaf.demo; + +import work.slhaf.demo.capability.BaseCognationManager; +import work.slhaf.demo.capability.interfaces.Coordinated; + +import java.util.ArrayList; +import java.util.List; + +public class MyCognationManager extends BaseCognationManager { + + @Coordinated(capability = "memory") + public List selectMemory(String path){ + return null; + } +} diff --git a/Partner-Capability-Demo/src/main/java/work/slhaf/demo/capability/BaseCognationManager.java b/Partner-Capability-Demo/src/main/java/work/slhaf/demo/capability/BaseCognationManager.java new file mode 100644 index 00000000..0a1e3db0 --- /dev/null +++ b/Partner-Capability-Demo/src/main/java/work/slhaf/demo/capability/BaseCognationManager.java @@ -0,0 +1,4 @@ +package work.slhaf.demo.capability; + +public class BaseCognationManager { +} diff --git a/Partner-Capability-Demo/src/main/java/work/slhaf/demo/capability/CapabilityRegisterFactory.java b/Partner-Capability-Demo/src/main/java/work/slhaf/demo/capability/CapabilityRegisterFactory.java new file mode 100644 index 00000000..aa35e36f --- /dev/null +++ b/Partner-Capability-Demo/src/main/java/work/slhaf/demo/capability/CapabilityRegisterFactory.java @@ -0,0 +1,232 @@ +package work.slhaf.demo.capability; + +import lombok.Setter; +import org.reflections.Reflections; +import org.reflections.scanners.Scanners; +import org.reflections.util.ClasspathHelper; +import org.reflections.util.ConfigurationBuilder; +import work.slhaf.demo.capability.exception.*; +import work.slhaf.demo.capability.interfaces.*; + +import java.lang.reflect.Method; +import java.net.URL; +import java.util.*; +import java.util.stream.Collectors; + +public class CapabilityRegisterFactory { + + public static volatile CapabilityRegisterFactory capabilityRegisterFactory; + + @Setter + private Reflections reflections; + + private CapabilityRegisterFactory() { + } + + public static CapabilityRegisterFactory getInstance() { + if (capabilityRegisterFactory == null) { + synchronized (CapabilityRegisterFactory.class) { + if (capabilityRegisterFactory == null) { + capabilityRegisterFactory = new CapabilityRegisterFactory(); + capabilityRegisterFactory.setReflections(getReflections()); + } + } + } + return capabilityRegisterFactory; + } + + private static Reflections getReflections() { + //后续可替换为根据传入的启动类获取路径 + Collection urls = ClasspathHelper.forJavaClassPath(); + return new Reflections( + new ConfigurationBuilder() + .setUrls(urls) + .setScanners(Scanners.TypesAnnotated, Scanners.MethodsAnnotated, Scanners.SubTypes) + ); + } + + public void registerCapabilities() { + //检查可注册能力是否正常 + statusCheck(); + //扫描现有Capability, value为键，返回函数路由表, 函数路由表内部通过反射调用对应core的方法 + //扫描时也需要排除掉 + } + + private void statusCheck() { + Set> cores = reflections.getTypesAnnotatedWith(CapabilityCore.class); + Set> capabilities = reflections.getTypesAnnotatedWith(Capability.class); + checkCountAndCapabilities(cores, capabilities); + checkCapabilityMethods(cores, capabilities); + checkCoordinatedMethods(capabilities); + } + + private void checkCoordinatedMethods(Set> capabilities) { + //检查各个capability中是否含有ToCoordinated注解 + //如果含有，则需要查找AbstractCognationManager的子类,看这里是否有对应的Coordinated注解所在方法 + Set methodsToCoordinated = capabilities.stream() + .flatMap(capability -> Arrays.stream(capability.getDeclaredMethods())) + .filter(method -> method.isAnnotationPresent(ToCoordinated.class)) + .map(method -> { + String capabilityValue = method.getDeclaringClass().getAnnotation(Capability.class).value(); + return capabilityValue + "." + methodSignature(method); + }) + .collect(Collectors.toSet()); + if (!methodsToCoordinated.isEmpty()) { + Set> subTypesOfAbsCM = reflections.getSubTypesOf(BaseCognationManager.class); + Set methodsCoordinated = getMethodsCoordinated(subTypesOfAbsCM); + if (!methodsCoordinated.equals(methodsToCoordinated)) { + // 找出缺少的协调方法 + Set missingMethods = new HashSet<>(methodsToCoordinated); + missingMethods.removeAll(methodsCoordinated); + + // 找出多余的协调方法 + Set extraMethods = new HashSet<>(methodsCoordinated); + extraMethods.removeAll(methodsToCoordinated); + + // 抛出异常或记录错误 + if (!missingMethods.isEmpty()) { + throw new UnMatchedCoordinatedMethodException("缺少协调方法: " + String.join(", ", missingMethods)); + } + if (!extraMethods.isEmpty()) { + throw new UnMatchedCoordinatedMethodException("发现多余的协调方法: " + String.join(", ", extraMethods)); + } + } + } + } + + private Set getMethodsCoordinated(Set> subTypesOfAbsCM) { + Set methodsCoordinated = new HashSet<>(); + for (Class cm : subTypesOfAbsCM) { + Method[] methods = cm.getMethods(); + for (Method method : methods) { + if (method.isAnnotationPresent(Coordinated.class)) { + methodsCoordinated.add(method.getAnnotation(Coordinated.class).capability() + "." + methodSignature(method)); + } + } + } + return methodsCoordinated; + } + + + private void checkCapabilityMethods(Set> cores, Set> capabilities) { + HashMap> capabilitiesMethods = getCapabilityMethods(capabilities); + StringBuilder sb = new StringBuilder(); + for (Class core : cores) { + List methodsWithAnnotation = Arrays.stream(core.getMethods()) + .filter(method -> method.isAnnotationPresent(CapabilityMethod.class)) + .toList(); + List capabilityMethods = capabilitiesMethods.get(core.getAnnotation(CapabilityCore.class).value()); + LackRecord lackRecord = checkMethodsMatched(methodsWithAnnotation, capabilityMethods); + if (lackRecord.hasNotEmptyRecord()) { + sb.append(lackRecord.toLackErrorMsg(core.getAnnotation(CapabilityCore.class).value())); + } + } + if (!sb.isEmpty()) { + throw new UnMatchedCapabilityMethodException(sb.toString()); + } + } + + private LackRecord checkMethodsMatched(List methodsWithAnnotation, List capabilityMethods) { + Set collectedMethodsWithAnnotation = methodsWithAnnotation.stream() + .filter(method -> !method.isAnnotationPresent(ToCoordinated.class)) + .map(this::methodSignature) + .collect(Collectors.toSet()); + Set collectedCapabilityMethods = capabilityMethods.stream() + .filter(method -> !method.isAnnotationPresent(ToCoordinated.class)) + .map(this::methodSignature) + .collect(Collectors.toSet()); + return checkMethodsMatched(collectedMethodsWithAnnotation, collectedCapabilityMethods); + } + + private LackRecord checkMethodsMatched(Set collectedMethodsWithAnnotation, Set collectedCapabilityMethods) { + List coreLack = new ArrayList<>(); + List capLack = new ArrayList<>(); + // 找出 core 中多余的方法 + for (String coreSig : collectedMethodsWithAnnotation) { + if (!collectedCapabilityMethods.contains(coreSig)) { + capLack.add(coreSig); + } + } + // 找出 capability 中多余的方法 + for (String capSig : collectedCapabilityMethods) { + if (!collectedMethodsWithAnnotation.contains(capSig)) { + coreLack.add(capSig); + } + } + return new LackRecord(coreLack, capLack); + + } + + private 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(); + } + + private HashMap> getCapabilityMethods(Set> capabilities) { + HashMap> capabilityMethods = new HashMap<>(); + capabilities.forEach(capability -> { + capabilityMethods.put(capability.getAnnotation(Capability.class).value(), Arrays.stream(capability.getMethods()).toList()); + }); + return capabilityMethods; + } + + private void checkCountAndCapabilities(Set> cores, Set> capabilities) { + if (cores.size() != capabilities.size()) { + throw new UnMatchedCapabilityException("Capability 注册异常: 已存在的CapabilityCore与Capability数量不匹配!"); + } + if (!checkValuesMatched(cores, capabilities)) { + throw new UnMatchedCapabilityException("Capability 注册异常: 已存在的CapabilityCore与Capability不匹配!"); + } + } + + + private boolean checkValuesMatched(Set> cores, Set> capabilities) { + Set coresValues = new HashSet<>(); + Set capabilitiesValues = new HashSet<>(); + for (Class core : cores) { + CapabilityCore annotation = core.getAnnotation(CapabilityCore.class); + if (annotation != null) { + if (coresValues.contains(annotation.value())) { + throw new DuplicateCapabilityException(String.format("Capability 注册异常: 重复的Capability核心: %s", annotation.value())); + } + coresValues.add(annotation.value()); + } + } + for (Class capability : capabilities) { + Capability annotation = capability.getAnnotation(Capability.class); + if (annotation != null) { + if (capabilitiesValues.contains(annotation.value())) { + throw new DuplicateCapabilityException(String.format("Capability 注册异常: 重复的Capability接口: %s", annotation.value())); + } + capabilitiesValues.add(annotation.value()); + } + } + return coresValues.equals(capabilitiesValues); + } + + record LackRecord(List coreLack, List capLack) { + public boolean hasNotEmptyRecord() { + return !coreLack.isEmpty() || !capLack.isEmpty(); + } + + public String toLackErrorMsg(String capabilityName) { + StringBuilder sb = new StringBuilder("\n").append(capabilityName).append("\n"); + if (!coreLack.isEmpty()) { + sb.append("缺少Core方法:").append("\n").append(coreLack).append("\n"); + } + if (!capLack.isEmpty()) { + sb.append("缺少Capability方法:").append("\n").append(capLack).append("\n"); + } + return sb.toString(); + } + } +} diff --git a/src/main/java/work/slhaf/agent/core/cognation/capability/ability/CacheCapability.java b/Partner-Capability-Demo/src/main/java/work/slhaf/demo/capability/ability/CacheCapability.java similarity index 77% rename from src/main/java/work/slhaf/agent/core/cognation/capability/ability/CacheCapability.java rename to Partner-Capability-Demo/src/main/java/work/slhaf/demo/capability/ability/CacheCapability.java index e1593bb8..8081da5e 100644 --- a/src/main/java/work/slhaf/agent/core/cognation/capability/ability/CacheCapability.java +++ b/Partner-Capability-Demo/src/main/java/work/slhaf/demo/capability/ability/CacheCapability.java @@ -1,6 +1,7 @@ -package work.slhaf.agent.core.cognation.capability.ability; +package work.slhaf.demo.capability.ability; -import work.slhaf.agent.core.cognation.capability.interfaces.Capability; + +import work.slhaf.demo.capability.interfaces.Capability; import java.time.LocalDateTime; import java.util.HashMap; diff --git a/Partner-Capability-Demo/src/main/java/work/slhaf/demo/capability/ability/MemoryCapability.java b/Partner-Capability-Demo/src/main/java/work/slhaf/demo/capability/ability/MemoryCapability.java new file mode 100644 index 00000000..784184a1 --- /dev/null +++ b/Partner-Capability-Demo/src/main/java/work/slhaf/demo/capability/ability/MemoryCapability.java @@ -0,0 +1,15 @@ +package work.slhaf.demo.capability.ability; + +import work.slhaf.demo.capability.interfaces.Capability; +import work.slhaf.demo.capability.interfaces.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-Capability-Demo/src/main/java/work/slhaf/demo/capability/ability/PerceiveCapability.java b/Partner-Capability-Demo/src/main/java/work/slhaf/demo/capability/ability/PerceiveCapability.java new file mode 100644 index 00000000..f4d6df4a --- /dev/null +++ b/Partner-Capability-Demo/src/main/java/work/slhaf/demo/capability/ability/PerceiveCapability.java @@ -0,0 +1,10 @@ +package work.slhaf.demo.capability.ability; + +import work.slhaf.demo.capability.interfaces.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-Capability-Demo/src/main/java/work/slhaf/demo/capability/exception/CapabilityCheckFailedException.java b/Partner-Capability-Demo/src/main/java/work/slhaf/demo/capability/exception/CapabilityCheckFailedException.java new file mode 100644 index 00000000..4d38c32f --- /dev/null +++ b/Partner-Capability-Demo/src/main/java/work/slhaf/demo/capability/exception/CapabilityCheckFailedException.java @@ -0,0 +1,7 @@ +package work.slhaf.demo.capability.exception; + +public class CapabilityCheckFailedException extends RuntimeException { + public CapabilityCheckFailedException(String message) { + super("Capability注册失败: "+message); + } +} diff --git a/Partner-Capability-Demo/src/main/java/work/slhaf/demo/capability/exception/DuplicateCapabilityException.java b/Partner-Capability-Demo/src/main/java/work/slhaf/demo/capability/exception/DuplicateCapabilityException.java new file mode 100644 index 00000000..1661a086 --- /dev/null +++ b/Partner-Capability-Demo/src/main/java/work/slhaf/demo/capability/exception/DuplicateCapabilityException.java @@ -0,0 +1,7 @@ +package work.slhaf.demo.capability.exception; + +public class DuplicateCapabilityException extends CapabilityCheckFailedException{ + public DuplicateCapabilityException(String message) { + super(message); + } +} diff --git a/Partner-Capability-Demo/src/main/java/work/slhaf/demo/capability/exception/UnMatchedCapabilityException.java b/Partner-Capability-Demo/src/main/java/work/slhaf/demo/capability/exception/UnMatchedCapabilityException.java new file mode 100644 index 00000000..83415ff9 --- /dev/null +++ b/Partner-Capability-Demo/src/main/java/work/slhaf/demo/capability/exception/UnMatchedCapabilityException.java @@ -0,0 +1,7 @@ +package work.slhaf.demo.capability.exception; + +public class UnMatchedCapabilityException extends CapabilityCheckFailedException{ + public UnMatchedCapabilityException(String message) { + super(message); + } +} diff --git a/Partner-Capability-Demo/src/main/java/work/slhaf/demo/capability/exception/UnMatchedCapabilityMethodException.java b/Partner-Capability-Demo/src/main/java/work/slhaf/demo/capability/exception/UnMatchedCapabilityMethodException.java new file mode 100644 index 00000000..a7894eb6 --- /dev/null +++ b/Partner-Capability-Demo/src/main/java/work/slhaf/demo/capability/exception/UnMatchedCapabilityMethodException.java @@ -0,0 +1,7 @@ +package work.slhaf.demo.capability.exception; + +public class UnMatchedCapabilityMethodException extends CapabilityCheckFailedException{ + public UnMatchedCapabilityMethodException(String message) { + super(message); + } +} diff --git a/Partner-Capability-Demo/src/main/java/work/slhaf/demo/capability/exception/UnMatchedCoordinatedMethodException.java b/Partner-Capability-Demo/src/main/java/work/slhaf/demo/capability/exception/UnMatchedCoordinatedMethodException.java new file mode 100644 index 00000000..528c0aad --- /dev/null +++ b/Partner-Capability-Demo/src/main/java/work/slhaf/demo/capability/exception/UnMatchedCoordinatedMethodException.java @@ -0,0 +1,7 @@ +package work.slhaf.demo.capability.exception; + +public class UnMatchedCoordinatedMethodException extends CapabilityCheckFailedException{ + public UnMatchedCoordinatedMethodException(String message) { + super(message); + } +} diff --git a/src/main/java/work/slhaf/agent/core/cognation/capability/interfaces/Capability.java b/Partner-Capability-Demo/src/main/java/work/slhaf/demo/capability/interfaces/Capability.java similarity index 67% rename from src/main/java/work/slhaf/agent/core/cognation/capability/interfaces/Capability.java rename to Partner-Capability-Demo/src/main/java/work/slhaf/demo/capability/interfaces/Capability.java index 6221b73b..254157a1 100644 --- a/src/main/java/work/slhaf/agent/core/cognation/capability/interfaces/Capability.java +++ b/Partner-Capability-Demo/src/main/java/work/slhaf/demo/capability/interfaces/Capability.java @@ -1,10 +1,13 @@ -package work.slhaf.agent.core.cognation.capability.interfaces; +package work.slhaf.demo.capability.interfaces; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +/** + * 用于注解能力接口，需要与`@CapabilityCore`对应的`value`一致 + */ @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.TYPE) public @interface Capability { diff --git a/src/main/java/work/slhaf/agent/core/cognation/capability/interfaces/CapabilityCore.java b/Partner-Capability-Demo/src/main/java/work/slhaf/demo/capability/interfaces/CapabilityCore.java similarity index 68% rename from src/main/java/work/slhaf/agent/core/cognation/capability/interfaces/CapabilityCore.java rename to Partner-Capability-Demo/src/main/java/work/slhaf/demo/capability/interfaces/CapabilityCore.java index 4d151170..6c213f54 100644 --- a/src/main/java/work/slhaf/agent/core/cognation/capability/interfaces/CapabilityCore.java +++ b/Partner-Capability-Demo/src/main/java/work/slhaf/demo/capability/interfaces/CapabilityCore.java @@ -1,10 +1,13 @@ -package work.slhaf.agent.core.cognation.capability.interfaces; +package work.slhaf.demo.capability.interfaces; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +/** + * 用于注解Core服务，需标识一个value致用于核心服务发现 + */ @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.TYPE) public @interface CapabilityCore { diff --git a/Partner-Capability-Demo/src/main/java/work/slhaf/demo/capability/interfaces/CapabilityMethod.java b/Partner-Capability-Demo/src/main/java/work/slhaf/demo/capability/interfaces/CapabilityMethod.java new file mode 100644 index 00000000..6fa6bc18 --- /dev/null +++ b/Partner-Capability-Demo/src/main/java/work/slhaf/demo/capability/interfaces/CapabilityMethod.java @@ -0,0 +1,11 @@ +package work.slhaf.demo.capability.interfaces; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +@Retention(RetentionPolicy.RUNTIME) +@Target(ElementType.METHOD) +public @interface CapabilityMethod { +} diff --git a/Partner-Capability-Demo/src/main/java/work/slhaf/demo/capability/interfaces/Coordinated.java b/Partner-Capability-Demo/src/main/java/work/slhaf/demo/capability/interfaces/Coordinated.java new file mode 100644 index 00000000..d5a60d8b --- /dev/null +++ b/Partner-Capability-Demo/src/main/java/work/slhaf/demo/capability/interfaces/Coordinated.java @@ -0,0 +1,15 @@ +package work.slhaf.demo.capability.interfaces; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * 用于标注协调方法，`value`值需与对应的`@ToCoordinated`保持一致 + */ +@Retention(RetentionPolicy.RUNTIME) +@Target(ElementType.METHOD) +public @interface Coordinated { + String capability(); +} diff --git a/Partner-Capability-Demo/src/main/java/work/slhaf/demo/capability/interfaces/InjectCapability.java b/Partner-Capability-Demo/src/main/java/work/slhaf/demo/capability/interfaces/InjectCapability.java new file mode 100644 index 00000000..564ad91e --- /dev/null +++ b/Partner-Capability-Demo/src/main/java/work/slhaf/demo/capability/interfaces/InjectCapability.java @@ -0,0 +1,14 @@ +package work.slhaf.demo.capability.interfaces; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * 用于注入`Capability` + */ +@Target(ElementType.FIELD) +@Retention(RetentionPolicy.RUNTIME) +public @interface InjectCapability { +} diff --git a/Partner-Capability-Demo/src/main/java/work/slhaf/demo/capability/interfaces/ToCoordinated.java b/Partner-Capability-Demo/src/main/java/work/slhaf/demo/capability/interfaces/ToCoordinated.java new file mode 100644 index 00000000..3f017760 --- /dev/null +++ b/Partner-Capability-Demo/src/main/java/work/slhaf/demo/capability/interfaces/ToCoordinated.java @@ -0,0 +1,15 @@ +package work.slhaf.demo.capability.interfaces; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * 当`@Capability`所注接口中，如果存在方法需要协调多个Core服务的调用，可以通过该注解进行排除 + * value值为方法对应标识，需与协调实现处的方法标识保持一致 + */ +@Target(ElementType.METHOD) +@Retention(RetentionPolicy.RUNTIME) +public @interface ToCoordinated { +} diff --git a/Partner-Capability-Demo/src/main/java/work/slhaf/demo/core/CacheCore.java b/Partner-Capability-Demo/src/main/java/work/slhaf/demo/core/CacheCore.java new file mode 100644 index 00000000..ee53bf72 --- /dev/null +++ b/Partner-Capability-Demo/src/main/java/work/slhaf/demo/core/CacheCore.java @@ -0,0 +1,57 @@ +package work.slhaf.demo.core; + +import lombok.extern.slf4j.Slf4j; +import work.slhaf.demo.capability.interfaces.CapabilityCore; +import work.slhaf.demo.capability.interfaces.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; + + public static CacheCore getInstance() { + if (cacheCore == null) { + synchronized (CacheCore.class) { + if (cacheCore == null) { + cacheCore = new CacheCore(); + } + } + } + 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) { + log.info("cache: getUserDialogMapStr"); + return ""; + } + +} diff --git a/Partner-Capability-Demo/src/main/java/work/slhaf/demo/core/MemoryCore.java b/Partner-Capability-Demo/src/main/java/work/slhaf/demo/core/MemoryCore.java new file mode 100644 index 00000000..2173ab34 --- /dev/null +++ b/Partner-Capability-Demo/src/main/java/work/slhaf/demo/core/MemoryCore.java @@ -0,0 +1,43 @@ +package work.slhaf.demo.core; + +import lombok.extern.slf4j.Slf4j; +import work.slhaf.demo.capability.interfaces.CapabilityCore; +import work.slhaf.demo.capability.interfaces.CapabilityMethod; + +import java.util.ArrayList; +import java.util.List; + +@CapabilityCore(value = "memory") +@Slf4j +public class MemoryCore { + + public static volatile MemoryCore memoryCore; + + public static MemoryCore getInstance() { + if (memoryCore == null){ + synchronized (MemoryCore.class){ + if (memoryCore == null){ + memoryCore = new MemoryCore(); + } + } + } + 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-Capability-Demo/src/main/java/work/slhaf/demo/core/PerceiveCore.java b/Partner-Capability-Demo/src/main/java/work/slhaf/demo/core/PerceiveCore.java new file mode 100644 index 00000000..0791ddfe --- /dev/null +++ b/Partner-Capability-Demo/src/main/java/work/slhaf/demo/core/PerceiveCore.java @@ -0,0 +1,41 @@ +package work.slhaf.demo.core; + +import lombok.extern.slf4j.Slf4j; +import work.slhaf.demo.capability.interfaces.CapabilityCore; +import work.slhaf.demo.capability.interfaces.CapabilityMethod; + +@CapabilityCore(value = "perceive") +@Slf4j +public class PerceiveCore { + + public static volatile PerceiveCore perceiveCore; + + public static PerceiveCore getInstance() { + if (perceiveCore == null){ + synchronized (PerceiveCore.class){ + if (perceiveCore == null){ + perceiveCore = new PerceiveCore(); + } + } + } + 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-Core/pom.xml b/Partner-Core/pom.xml new file mode 100644 index 00000000..bda6d18f --- /dev/null +++ b/Partner-Core/pom.xml @@ -0,0 +1,20 @@ + + + 4.0.0 + + work.slhaf + Partner + 0.5.0 + + + Partner-Core + + + 21 + 21 + UTF-8 + + + \ No newline at end of file diff --git a/src/main/java/work/slhaf/Main.java b/Partner-Core/src/main/java/work/slhaf/Main.java similarity index 74% rename from src/main/java/work/slhaf/Main.java rename to Partner-Core/src/main/java/work/slhaf/Main.java index 32d10648..833d5fd8 100644 --- a/src/main/java/work/slhaf/Main.java +++ b/Partner-Core/src/main/java/work/slhaf/Main.java @@ -1,6 +1,6 @@ package work.slhaf; -import work.slhaf.agent.Agent; +import work.slhaf.partner.Agent; import java.io.IOException; import java.util.Scanner; @@ -9,6 +9,6 @@ public class Main { public static void main(String[] args) throws IOException { Agent.initialize(); Scanner scanner = new Scanner(System.in); - while (!scanner.nextLine().equals("exit")); + while (!scanner.nextLine().equals("exit")) ; } } \ No newline at end of file diff --git a/src/main/java/work/slhaf/agent/Agent.java b/Partner-Core/src/main/java/work/slhaf/partner/Agent.java similarity index 77% rename from src/main/java/work/slhaf/agent/Agent.java rename to Partner-Core/src/main/java/work/slhaf/partner/Agent.java index b47c5bd6..fac47350 100644 --- a/src/main/java/work/slhaf/agent/Agent.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/Agent.java @@ -1,16 +1,16 @@ -package work.slhaf.agent; +package work.slhaf.partner; import lombok.Data; import lombok.extern.slf4j.Slf4j; -import work.slhaf.agent.common.config.Config; -import work.slhaf.agent.common.monitor.DebugMonitor; -import work.slhaf.agent.core.InteractionHub; -import work.slhaf.agent.core.interaction.agent_interface.InputReceiver; -import work.slhaf.agent.core.interaction.agent_interface.TaskCallback; -import work.slhaf.agent.core.interaction.data.InteractionInputData; -import work.slhaf.agent.core.interaction.data.InteractionOutputData; -import work.slhaf.agent.gateway.AgentWebSocketServer; -import work.slhaf.agent.gateway.MessageSender; +import work.slhaf.partner.common.config.Config; +import work.slhaf.partner.common.monitor.DebugMonitor; +import work.slhaf.partner.core.InteractionHub; +import work.slhaf.partner.core.interaction.agent_interface.InputReceiver; +import work.slhaf.partner.core.interaction.agent_interface.TaskCallback; +import work.slhaf.partner.core.interaction.data.InteractionInputData; +import work.slhaf.partner.core.interaction.data.InteractionOutputData; +import work.slhaf.partner.gateway.AgentWebSocketServer; +import work.slhaf.partner.gateway.MessageSender; import java.io.IOException; import java.time.LocalDateTime; diff --git a/src/main/java/work/slhaf/agent/common/chat/ChatClient.java b/Partner-Core/src/main/java/work/slhaf/partner/common/chat/ChatClient.java similarity index 85% rename from src/main/java/work/slhaf/agent/common/chat/ChatClient.java rename to Partner-Core/src/main/java/work/slhaf/partner/common/chat/ChatClient.java index 8ac006b0..63334dac 100644 --- a/src/main/java/work/slhaf/agent/common/chat/ChatClient.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/common/chat/ChatClient.java @@ -1,15 +1,15 @@ -package work.slhaf.agent.common.chat; +package work.slhaf.partner.common.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.agent.common.chat.constant.ChatConstant; -import work.slhaf.agent.common.chat.pojo.ChatBody; -import work.slhaf.agent.common.chat.pojo.ChatResponse; -import work.slhaf.agent.common.chat.pojo.Message; -import work.slhaf.agent.common.chat.pojo.PrimaryChatResponse; +import work.slhaf.partner.common.chat.constant.ChatConstant; +import work.slhaf.partner.common.chat.pojo.ChatBody; +import work.slhaf.partner.common.chat.pojo.ChatResponse; +import work.slhaf.partner.common.chat.pojo.Message; +import work.slhaf.partner.common.chat.pojo.PrimaryChatResponse; import java.util.List; diff --git a/src/main/java/work/slhaf/agent/common/chat/constant/ChatConstant.java b/Partner-Core/src/main/java/work/slhaf/partner/common/chat/constant/ChatConstant.java similarity index 93% rename from src/main/java/work/slhaf/agent/common/chat/constant/ChatConstant.java rename to Partner-Core/src/main/java/work/slhaf/partner/common/chat/constant/ChatConstant.java index 20f47cb0..a327a25e 100644 --- a/src/main/java/work/slhaf/agent/common/chat/constant/ChatConstant.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/common/chat/constant/ChatConstant.java @@ -1,4 +1,4 @@ -package work.slhaf.agent.common.chat.constant; +package work.slhaf.partner.common.chat.constant; public class ChatConstant { diff --git a/src/main/java/work/slhaf/agent/common/chat/pojo/ChatBody.java b/Partner-Core/src/main/java/work/slhaf/partner/common/chat/pojo/ChatBody.java similarity index 91% rename from src/main/java/work/slhaf/agent/common/chat/pojo/ChatBody.java rename to Partner-Core/src/main/java/work/slhaf/partner/common/chat/pojo/ChatBody.java index 7a52653c..f8f25ab4 100644 --- a/src/main/java/work/slhaf/agent/common/chat/pojo/ChatBody.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/common/chat/pojo/ChatBody.java @@ -1,4 +1,4 @@ -package work.slhaf.agent.common.chat.pojo; +package work.slhaf.partner.common.chat.pojo; import lombok.*; diff --git a/src/main/java/work/slhaf/agent/common/chat/pojo/ChatResponse.java b/Partner-Core/src/main/java/work/slhaf/partner/common/chat/pojo/ChatResponse.java similarity index 87% rename from src/main/java/work/slhaf/agent/common/chat/pojo/ChatResponse.java rename to Partner-Core/src/main/java/work/slhaf/partner/common/chat/pojo/ChatResponse.java index 07e1a30a..289c7e57 100644 --- a/src/main/java/work/slhaf/agent/common/chat/pojo/ChatResponse.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/common/chat/pojo/ChatResponse.java @@ -1,4 +1,4 @@ -package work.slhaf.agent.common.chat.pojo; +package work.slhaf.partner.common.chat.pojo; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/work/slhaf/agent/common/chat/pojo/Message.java b/Partner-Core/src/main/java/work/slhaf/partner/common/chat/pojo/Message.java similarity index 75% rename from src/main/java/work/slhaf/agent/common/chat/pojo/Message.java rename to Partner-Core/src/main/java/work/slhaf/partner/common/chat/pojo/Message.java index c7b169ff..b36f7cdb 100644 --- a/src/main/java/work/slhaf/agent/common/chat/pojo/Message.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/common/chat/pojo/Message.java @@ -1,7 +1,7 @@ -package work.slhaf.agent.common.chat.pojo; +package work.slhaf.partner.common.chat.pojo; import lombok.*; -import work.slhaf.agent.common.serialize.PersistableObject; +import work.slhaf.partner.common.serialize.PersistableObject; import java.io.Serial; diff --git a/src/main/java/work/slhaf/agent/common/chat/pojo/MetaMessage.java b/Partner-Core/src/main/java/work/slhaf/partner/common/chat/pojo/MetaMessage.java similarity index 77% rename from src/main/java/work/slhaf/agent/common/chat/pojo/MetaMessage.java rename to Partner-Core/src/main/java/work/slhaf/partner/common/chat/pojo/MetaMessage.java index e0fc3358..3a26bdda 100644 --- a/src/main/java/work/slhaf/agent/common/chat/pojo/MetaMessage.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/common/chat/pojo/MetaMessage.java @@ -1,9 +1,9 @@ -package work.slhaf.agent.common.chat.pojo; +package work.slhaf.partner.common.chat.pojo; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; -import work.slhaf.agent.common.serialize.PersistableObject; +import work.slhaf.partner.common.serialize.PersistableObject; import java.io.Serial; diff --git a/src/main/java/work/slhaf/agent/common/chat/pojo/PrimaryChatResponse.java b/Partner-Core/src/main/java/work/slhaf/partner/common/chat/pojo/PrimaryChatResponse.java similarity index 97% rename from src/main/java/work/slhaf/agent/common/chat/pojo/PrimaryChatResponse.java rename to Partner-Core/src/main/java/work/slhaf/partner/common/chat/pojo/PrimaryChatResponse.java index 29769e65..5d4e439c 100644 --- a/src/main/java/work/slhaf/agent/common/chat/pojo/PrimaryChatResponse.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/common/chat/pojo/PrimaryChatResponse.java @@ -1,4 +1,4 @@ -package work.slhaf.agent.common.chat.pojo; +package work.slhaf.partner.common.chat.pojo; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/work/slhaf/agent/common/config/Config.java b/Partner-Core/src/main/java/work/slhaf/partner/common/config/Config.java similarity index 93% rename from src/main/java/work/slhaf/agent/common/config/Config.java rename to Partner-Core/src/main/java/work/slhaf/partner/common/config/Config.java index 598f72a0..24f43ae9 100644 --- a/src/main/java/work/slhaf/agent/common/config/Config.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/common/config/Config.java @@ -1,14 +1,14 @@ -package work.slhaf.agent.common.config; +package work.slhaf.partner.common.config; import cn.hutool.json.JSONUtil; import com.alibaba.fastjson2.JSONArray; import lombok.Data; import lombok.extern.slf4j.Slf4j; import org.apache.commons.io.FileUtils; -import work.slhaf.agent.module.modules.core.CoreModel; -import work.slhaf.agent.module.modules.memory.selector.MemorySelector; -import work.slhaf.agent.module.modules.memory.updater.MemoryUpdater; -import work.slhaf.agent.module.modules.process.PostprocessExecutor; +import work.slhaf.partner.module.modules.core.CoreModel; +import work.slhaf.partner.module.modules.memory.selector.MemorySelector; +import work.slhaf.partner.module.modules.memory.updater.MemoryUpdater; +import work.slhaf.partner.module.modules.process.PostprocessExecutor; import java.io.File; import java.io.IOException; diff --git a/src/main/java/work/slhaf/agent/common/config/ModelConfig.java b/Partner-Core/src/main/java/work/slhaf/partner/common/config/ModelConfig.java similarity index 96% rename from src/main/java/work/slhaf/agent/common/config/ModelConfig.java rename to Partner-Core/src/main/java/work/slhaf/partner/common/config/ModelConfig.java index be2c3f07..41b0e37f 100644 --- a/src/main/java/work/slhaf/agent/common/config/ModelConfig.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/common/config/ModelConfig.java @@ -1,4 +1,4 @@ -package work.slhaf.agent.common.config; +package work.slhaf.partner.common.config; import cn.hutool.json.JSONUtil; import lombok.Data; diff --git a/src/main/java/work/slhaf/agent/common/config/ModuleConfig.java b/Partner-Core/src/main/java/work/slhaf/partner/common/config/ModuleConfig.java similarity index 89% rename from src/main/java/work/slhaf/agent/common/config/ModuleConfig.java rename to Partner-Core/src/main/java/work/slhaf/partner/common/config/ModuleConfig.java index 8006c15c..db5304b5 100644 --- a/src/main/java/work/slhaf/agent/common/config/ModuleConfig.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/common/config/ModuleConfig.java @@ -1,4 +1,4 @@ -package work.slhaf.agent.common.config; +package work.slhaf.partner.common.config; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/work/slhaf/agent/common/config/WebSocketConfig.java b/Partner-Core/src/main/java/work/slhaf/partner/common/config/WebSocketConfig.java similarity index 67% rename from src/main/java/work/slhaf/agent/common/config/WebSocketConfig.java rename to Partner-Core/src/main/java/work/slhaf/partner/common/config/WebSocketConfig.java index c82dc430..e1821684 100644 --- a/src/main/java/work/slhaf/agent/common/config/WebSocketConfig.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/common/config/WebSocketConfig.java @@ -1,4 +1,4 @@ -package work.slhaf.agent.common.config; +package work.slhaf.partner.common.config; import lombok.Data; diff --git a/src/main/java/work/slhaf/agent/common/exception_handler/GlobalExceptionHandler.java b/Partner-Core/src/main/java/work/slhaf/partner/common/exception_handler/GlobalExceptionHandler.java similarity index 88% rename from src/main/java/work/slhaf/agent/common/exception_handler/GlobalExceptionHandler.java rename to Partner-Core/src/main/java/work/slhaf/partner/common/exception_handler/GlobalExceptionHandler.java index 7b9cd1c2..ce2b0e6c 100644 --- a/src/main/java/work/slhaf/agent/common/exception_handler/GlobalExceptionHandler.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/common/exception_handler/GlobalExceptionHandler.java @@ -1,8 +1,8 @@ -package work.slhaf.agent.common.exception_handler; +package work.slhaf.partner.common.exception_handler; import lombok.extern.slf4j.Slf4j; -import work.slhaf.agent.common.exception_handler.pojo.GlobalException; -import work.slhaf.agent.common.exception_handler.pojo.GlobalExceptionData; +import work.slhaf.partner.common.exception_handler.pojo.GlobalException; +import work.slhaf.partner.common.exception_handler.pojo.GlobalExceptionData; import java.io.*; import java.nio.file.Files; diff --git a/src/main/java/work/slhaf/agent/common/exception_handler/pojo/GlobalException.java b/Partner-Core/src/main/java/work/slhaf/partner/common/exception_handler/pojo/GlobalException.java similarity index 75% rename from src/main/java/work/slhaf/agent/common/exception_handler/pojo/GlobalException.java rename to Partner-Core/src/main/java/work/slhaf/partner/common/exception_handler/pojo/GlobalException.java index 6d0faa5e..3ed5074d 100644 --- a/src/main/java/work/slhaf/agent/common/exception_handler/pojo/GlobalException.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/common/exception_handler/pojo/GlobalException.java @@ -1,11 +1,11 @@ -package work.slhaf.agent.common.exception_handler.pojo; +package work.slhaf.partner.common.exception_handler.pojo; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.extern.slf4j.Slf4j; -import work.slhaf.agent.core.cognation.CognationManager; -import work.slhaf.agent.core.interaction.data.context.InteractionContext; -import work.slhaf.agent.core.session.SessionManager; +import work.slhaf.partner.core.cognation.CognationManager; +import work.slhaf.partner.core.interaction.data.context.InteractionContext; +import work.slhaf.partner.core.session.SessionManager; @EqualsAndHashCode(callSuper = true) @Slf4j diff --git a/src/main/java/work/slhaf/agent/common/exception_handler/pojo/GlobalExceptionData.java b/Partner-Core/src/main/java/work/slhaf/partner/common/exception_handler/pojo/GlobalExceptionData.java similarity index 61% rename from src/main/java/work/slhaf/agent/common/exception_handler/pojo/GlobalExceptionData.java rename to Partner-Core/src/main/java/work/slhaf/partner/common/exception_handler/pojo/GlobalExceptionData.java index dfb35b8d..59059076 100644 --- a/src/main/java/work/slhaf/agent/common/exception_handler/pojo/GlobalExceptionData.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/common/exception_handler/pojo/GlobalExceptionData.java @@ -1,11 +1,11 @@ -package work.slhaf.agent.common.exception_handler.pojo; +package work.slhaf.partner.common.exception_handler.pojo; import lombok.Data; import lombok.EqualsAndHashCode; -import work.slhaf.agent.common.serialize.PersistableObject; -import work.slhaf.agent.core.cognation.CognationManager; -import work.slhaf.agent.core.interaction.data.context.InteractionContext; -import work.slhaf.agent.core.session.SessionManager; +import work.slhaf.partner.common.serialize.PersistableObject; +import work.slhaf.partner.core.cognation.CognationManager; +import work.slhaf.partner.core.interaction.data.context.InteractionContext; +import work.slhaf.partner.core.session.SessionManager; import java.io.Serial; import java.util.HashMap; diff --git a/src/main/java/work/slhaf/agent/common/monitor/DebugMonitor.java b/Partner-Core/src/main/java/work/slhaf/partner/common/monitor/DebugMonitor.java similarity index 88% rename from src/main/java/work/slhaf/agent/common/monitor/DebugMonitor.java rename to Partner-Core/src/main/java/work/slhaf/partner/common/monitor/DebugMonitor.java index 0d35c06f..d70d736c 100644 --- a/src/main/java/work/slhaf/agent/common/monitor/DebugMonitor.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/common/monitor/DebugMonitor.java @@ -1,7 +1,7 @@ -package work.slhaf.agent.common.monitor; +package work.slhaf.partner.common.monitor; import lombok.extern.slf4j.Slf4j; -import work.slhaf.agent.common.thread.InteractionThreadPoolExecutor; +import work.slhaf.partner.common.thread.InteractionThreadPoolExecutor; @Slf4j public class DebugMonitor { diff --git a/src/main/java/work/slhaf/agent/common/serialize/PersistableObject.java b/Partner-Core/src/main/java/work/slhaf/partner/common/serialize/PersistableObject.java similarity index 68% rename from src/main/java/work/slhaf/agent/common/serialize/PersistableObject.java rename to Partner-Core/src/main/java/work/slhaf/partner/common/serialize/PersistableObject.java index ddee853e..f0496b95 100644 --- a/src/main/java/work/slhaf/agent/common/serialize/PersistableObject.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/common/serialize/PersistableObject.java @@ -1,4 +1,4 @@ -package work.slhaf.agent.common.serialize; +package work.slhaf.partner.common.serialize; import java.io.Serializable; diff --git a/src/main/java/work/slhaf/agent/common/thread/InteractionThreadPoolExecutor.java b/Partner-Core/src/main/java/work/slhaf/partner/common/thread/InteractionThreadPoolExecutor.java similarity index 96% rename from src/main/java/work/slhaf/agent/common/thread/InteractionThreadPoolExecutor.java rename to Partner-Core/src/main/java/work/slhaf/partner/common/thread/InteractionThreadPoolExecutor.java index d085df65..bf32a6f5 100644 --- a/src/main/java/work/slhaf/agent/common/thread/InteractionThreadPoolExecutor.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/common/thread/InteractionThreadPoolExecutor.java @@ -1,4 +1,4 @@ -package work.slhaf.agent.common.thread; +package work.slhaf.partner.common.thread; import lombok.Getter; diff --git a/src/main/java/work/slhaf/agent/common/util/ExtractUtil.java b/Partner-Core/src/main/java/work/slhaf/partner/common/util/ExtractUtil.java similarity index 97% rename from src/main/java/work/slhaf/agent/common/util/ExtractUtil.java rename to Partner-Core/src/main/java/work/slhaf/partner/common/util/ExtractUtil.java index 81de6325..69c5152b 100644 --- a/src/main/java/work/slhaf/agent/common/util/ExtractUtil.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/common/util/ExtractUtil.java @@ -1,4 +1,4 @@ -package work.slhaf.agent.common.util; +package work.slhaf.partner.common.util; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/work/slhaf/agent/common/util/ResourcesUtil.java b/Partner-Core/src/main/java/work/slhaf/partner/common/util/ResourcesUtil.java similarity index 93% rename from src/main/java/work/slhaf/agent/common/util/ResourcesUtil.java rename to Partner-Core/src/main/java/work/slhaf/partner/common/util/ResourcesUtil.java index 8a8ae4ca..530e24b9 100644 --- a/src/main/java/work/slhaf/agent/common/util/ResourcesUtil.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/common/util/ResourcesUtil.java @@ -1,8 +1,8 @@ -package work.slhaf.agent.common.util; +package work.slhaf.partner.common.util; import com.alibaba.fastjson2.JSONArray; -import work.slhaf.agent.Agent; -import work.slhaf.agent.common.chat.pojo.Message; +import work.slhaf.partner.Agent; +import work.slhaf.partner.common.chat.pojo.Message; import java.io.InputStream; import java.nio.charset.StandardCharsets; diff --git a/src/main/java/work/slhaf/agent/core/InteractionHub.java b/Partner-Core/src/main/java/work/slhaf/partner/core/InteractionHub.java similarity index 70% rename from src/main/java/work/slhaf/agent/core/InteractionHub.java rename to Partner-Core/src/main/java/work/slhaf/partner/core/InteractionHub.java index 7a0d9424..ade24a61 100644 --- a/src/main/java/work/slhaf/agent/core/InteractionHub.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/core/InteractionHub.java @@ -1,18 +1,16 @@ -package work.slhaf.agent.core; +package work.slhaf.partner.core; import lombok.Data; import lombok.ToString; import lombok.extern.slf4j.Slf4j; -import work.slhaf.agent.common.exception_handler.GlobalExceptionHandler; -import work.slhaf.agent.common.exception_handler.pojo.GlobalException; -import work.slhaf.agent.core.interaction.agent_interface.TaskCallback; -import work.slhaf.agent.core.interaction.data.InteractionInputData; -import work.slhaf.agent.core.interaction.data.context.InteractionContext; -import work.slhaf.agent.core.interaction.module.InteractionModule; -import work.slhaf.agent.core.interaction.module.InteractionModulesLoader; -import work.slhaf.agent.module.modules.core.CoreModel; -import work.slhaf.agent.module.modules.process.PreprocessExecutor; -import work.slhaf.agent.module.modules.task.TaskScheduler; +import work.slhaf.partner.common.exception_handler.GlobalExceptionHandler; +import work.slhaf.partner.common.exception_handler.pojo.GlobalException; +import work.slhaf.partner.core.interaction.agent_interface.TaskCallback; +import work.slhaf.partner.core.interaction.data.InteractionInputData; +import work.slhaf.partner.core.interaction.data.context.InteractionContext; +import work.slhaf.partner.core.interaction.module.InteractionModule; +import work.slhaf.partner.core.interaction.module.InteractionModulesLoader; +import work.slhaf.partner.module.modules.process.PreprocessExecutor; import java.io.IOException; import java.util.List; diff --git a/src/main/java/work/slhaf/agent/core/cognation/CognationManager.java b/Partner-Core/src/main/java/work/slhaf/partner/core/cognation/CognationManager.java similarity index 86% rename from src/main/java/work/slhaf/agent/core/cognation/CognationManager.java rename to Partner-Core/src/main/java/work/slhaf/partner/core/cognation/CognationManager.java index da8ede0f..4030df57 100644 --- a/src/main/java/work/slhaf/agent/core/cognation/CognationManager.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/core/cognation/CognationManager.java @@ -1,31 +1,31 @@ -package work.slhaf.agent.core.cognation; +package work.slhaf.partner.core.cognation; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.extern.slf4j.Slf4j; -import work.slhaf.agent.common.chat.constant.ChatConstant; -import work.slhaf.agent.common.chat.pojo.Message; -import work.slhaf.agent.common.config.Config; -import work.slhaf.agent.common.exception_handler.GlobalExceptionHandler; -import work.slhaf.agent.common.exception_handler.pojo.GlobalException; -import work.slhaf.agent.common.serialize.PersistableObject; -import work.slhaf.agent.core.cognation.capability.ability.CognationCapability; -import work.slhaf.agent.core.cognation.cognation.CognationCore; -import work.slhaf.agent.core.cognation.cognation.exception.UserNotExistsException; -import work.slhaf.agent.core.cognation.cognation.pojo.ActiveData; -import work.slhaf.agent.core.cognation.common.pojo.MemoryResult; -import work.slhaf.agent.core.cognation.common.pojo.MemorySliceResult; -import work.slhaf.agent.core.cognation.capability.ability.CacheCapability; -import work.slhaf.agent.core.cognation.submodule.cache.CacheCore; -import work.slhaf.agent.core.cognation.submodule.dispatch.DispatchCore; -import work.slhaf.agent.core.cognation.capability.ability.MemoryCapability; -import work.slhaf.agent.core.cognation.submodule.memory.MemoryCore; -import work.slhaf.agent.core.cognation.submodule.memory.pojo.MemorySlice; -import work.slhaf.agent.core.cognation.capability.ability.PerceiveCapability; -import work.slhaf.agent.core.cognation.submodule.perceive.PerceiveCore; -import work.slhaf.agent.core.cognation.submodule.perceive.pojo.User; -import work.slhaf.agent.core.cognation.submodule.memory.pojo.EvaluatedSlice; +import work.slhaf.partner.common.chat.constant.ChatConstant; +import work.slhaf.partner.common.chat.pojo.Message; +import work.slhaf.partner.common.config.Config; +import work.slhaf.partner.common.exception_handler.GlobalExceptionHandler; +import work.slhaf.partner.common.exception_handler.pojo.GlobalException; +import work.slhaf.partner.common.serialize.PersistableObject; +import work.slhaf.partner.core.cognation.capability.ability.CacheCapability; +import work.slhaf.partner.core.cognation.capability.ability.CognationCapability; +import work.slhaf.partner.core.cognation.capability.ability.MemoryCapability; +import work.slhaf.partner.core.cognation.capability.ability.PerceiveCapability; +import work.slhaf.partner.core.cognation.cognation.CognationCore; +import work.slhaf.partner.core.cognation.cognation.exception.UserNotExistsException; +import work.slhaf.partner.core.cognation.cognation.pojo.ActiveData; +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.cache.CacheCore; +import work.slhaf.partner.core.cognation.submodule.dispatch.DispatchCore; +import work.slhaf.partner.core.cognation.submodule.memory.MemoryCore; +import work.slhaf.partner.core.cognation.submodule.memory.pojo.EvaluatedSlice; +import work.slhaf.partner.core.cognation.submodule.memory.pojo.MemorySlice; +import work.slhaf.partner.core.cognation.submodule.perceive.PerceiveCore; +import work.slhaf.partner.core.cognation.submodule.perceive.pojo.User; import java.io.IOException; import java.io.Serial; @@ -37,7 +37,7 @@ import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; -import static work.slhaf.agent.common.util.ExtractUtil.extractUserId; +import static work.slhaf.partner.common.util.ExtractUtil.extractUserId; @EqualsAndHashCode(callSuper = true) @Data @Slf4j diff --git a/Partner-Core/src/main/java/work/slhaf/partner/core/cognation/capability/CapabilityRegisterFactory.java b/Partner-Core/src/main/java/work/slhaf/partner/core/cognation/capability/CapabilityRegisterFactory.java new file mode 100644 index 00000000..d28c2f83 --- /dev/null +++ b/Partner-Core/src/main/java/work/slhaf/partner/core/cognation/capability/CapabilityRegisterFactory.java @@ -0,0 +1,14 @@ +package work.slhaf.partner.core.cognation.capability; + +import org.reflections.Reflections; +import work.slhaf.partner.core.cognation.capability.exception.CapabilityRegisterFailedException; +import work.slhaf.partner.core.cognation.capability.interfaces.Capability; +import work.slhaf.partner.core.cognation.capability.interfaces.CapabilityCore; + +import java.util.ArrayList; +import java.util.List; +import java.util.Set; + +public class CapabilityRegisterFactory { + +} diff --git a/Partner-Core/src/main/java/work/slhaf/partner/core/cognation/capability/ability/CacheCapability.java b/Partner-Core/src/main/java/work/slhaf/partner/core/cognation/capability/ability/CacheCapability.java new file mode 100644 index 00000000..478cfa1e --- /dev/null +++ b/Partner-Core/src/main/java/work/slhaf/partner/core/cognation/capability/ability/CacheCapability.java @@ -0,0 +1,13 @@ +package work.slhaf.partner.core.cognation.capability.ability; + +import java.time.LocalDateTime; +import java.util.HashMap; +import java.util.concurrent.ConcurrentHashMap; + +public interface CacheCapability { + HashMap getDialogMap(); + ConcurrentHashMap getUserDialogMap(String userId); + void updateDialogMap(LocalDateTime dateTime, String newDialogCache); + String getDialogMapStr(); + String getUserDialogMapStr(String userId); +} diff --git a/src/main/java/work/slhaf/agent/core/cognation/capability/ability/CognationCapability.java b/Partner-Core/src/main/java/work/slhaf/partner/core/cognation/capability/ability/CognationCapability.java similarity index 78% rename from src/main/java/work/slhaf/agent/core/cognation/capability/ability/CognationCapability.java rename to Partner-Core/src/main/java/work/slhaf/partner/core/cognation/capability/ability/CognationCapability.java index 0c63fc81..697fe1b5 100644 --- a/src/main/java/work/slhaf/agent/core/cognation/capability/ability/CognationCapability.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/core/cognation/capability/ability/CognationCapability.java @@ -1,7 +1,7 @@ -package work.slhaf.agent.core.cognation.capability.ability; +package work.slhaf.partner.core.cognation.capability.ability; -import work.slhaf.agent.common.chat.pojo.Message; -import work.slhaf.agent.core.cognation.submodule.memory.pojo.EvaluatedSlice; +import work.slhaf.partner.common.chat.pojo.Message; +import work.slhaf.partner.core.cognation.submodule.memory.pojo.EvaluatedSlice; import java.util.HashMap; import java.util.List; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/core/cognation/capability/ability/DispatchCapability.java b/Partner-Core/src/main/java/work/slhaf/partner/core/cognation/capability/ability/DispatchCapability.java new file mode 100644 index 00000000..2812b28e --- /dev/null +++ b/Partner-Core/src/main/java/work/slhaf/partner/core/cognation/capability/ability/DispatchCapability.java @@ -0,0 +1,4 @@ +package work.slhaf.partner.core.cognation.capability.ability; + +public interface DispatchCapability { +} diff --git a/src/main/java/work/slhaf/agent/core/cognation/capability/ability/MemoryCapability.java b/Partner-Core/src/main/java/work/slhaf/partner/core/cognation/capability/ability/MemoryCapability.java similarity index 64% rename from src/main/java/work/slhaf/agent/core/cognation/capability/ability/MemoryCapability.java rename to Partner-Core/src/main/java/work/slhaf/partner/core/cognation/capability/ability/MemoryCapability.java index 9316b113..f5aa5bae 100644 --- a/src/main/java/work/slhaf/agent/core/cognation/capability/ability/MemoryCapability.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/core/cognation/capability/ability/MemoryCapability.java @@ -1,7 +1,7 @@ -package work.slhaf.agent.core.cognation.capability.ability; +package work.slhaf.partner.core.cognation.capability.ability; -import work.slhaf.agent.core.cognation.common.pojo.MemoryResult; -import work.slhaf.agent.core.cognation.submodule.memory.pojo.MemorySlice; +import work.slhaf.partner.core.cognation.common.pojo.MemoryResult; +import work.slhaf.partner.core.cognation.submodule.memory.pojo.MemorySlice; import java.io.IOException; import java.time.LocalDate; diff --git a/src/main/java/work/slhaf/agent/core/cognation/capability/ability/PerceiveCapability.java b/Partner-Core/src/main/java/work/slhaf/partner/core/cognation/capability/ability/PerceiveCapability.java similarity index 62% rename from src/main/java/work/slhaf/agent/core/cognation/capability/ability/PerceiveCapability.java rename to Partner-Core/src/main/java/work/slhaf/partner/core/cognation/capability/ability/PerceiveCapability.java index 000af60a..fb97e490 100644 --- a/src/main/java/work/slhaf/agent/core/cognation/capability/ability/PerceiveCapability.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/core/cognation/capability/ability/PerceiveCapability.java @@ -1,6 +1,6 @@ -package work.slhaf.agent.core.cognation.capability.ability; +package work.slhaf.partner.core.cognation.capability.ability; -import work.slhaf.agent.core.cognation.submodule.perceive.pojo.User; +import work.slhaf.partner.core.cognation.submodule.perceive.pojo.User; public interface PerceiveCapability { User getUser(String userInfo, String client); diff --git a/src/main/java/work/slhaf/agent/core/cognation/capability/exception/CapabilityRegisterFailedException.java b/Partner-Core/src/main/java/work/slhaf/partner/core/cognation/capability/exception/CapabilityRegisterFailedException.java similarity index 72% rename from src/main/java/work/slhaf/agent/core/cognation/capability/exception/CapabilityRegisterFailedException.java rename to Partner-Core/src/main/java/work/slhaf/partner/core/cognation/capability/exception/CapabilityRegisterFailedException.java index f5e7e31c..2e07f138 100644 --- a/src/main/java/work/slhaf/agent/core/cognation/capability/exception/CapabilityRegisterFailedException.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/core/cognation/capability/exception/CapabilityRegisterFailedException.java @@ -1,4 +1,4 @@ -package work.slhaf.agent.core.cognation.capability.exception; +package work.slhaf.partner.core.cognation.capability.exception; public class CapabilityRegisterFailedException extends RuntimeException { public CapabilityRegisterFailedException(String message) { diff --git a/Partner-Core/src/main/java/work/slhaf/partner/core/cognation/capability/interfaces/Capability.java b/Partner-Core/src/main/java/work/slhaf/partner/core/cognation/capability/interfaces/Capability.java new file mode 100644 index 00000000..795f2146 --- /dev/null +++ b/Partner-Core/src/main/java/work/slhaf/partner/core/cognation/capability/interfaces/Capability.java @@ -0,0 +1,15 @@ +package work.slhaf.partner.core.cognation.capability.interfaces; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * 用于注解能力接口，需要与`@CapabilityCore`对应的`value`一致 + */ +@Retention(RetentionPolicy.RUNTIME) +@Target(ElementType.TYPE) +public @interface Capability { + String value(); +} diff --git a/Partner-Core/src/main/java/work/slhaf/partner/core/cognation/capability/interfaces/CapabilityCore.java b/Partner-Core/src/main/java/work/slhaf/partner/core/cognation/capability/interfaces/CapabilityCore.java new file mode 100644 index 00000000..43c28bdf --- /dev/null +++ b/Partner-Core/src/main/java/work/slhaf/partner/core/cognation/capability/interfaces/CapabilityCore.java @@ -0,0 +1,15 @@ +package work.slhaf.partner.core.cognation.capability.interfaces; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * 用于注解Core服务，需标识一个value致用于核心服务发现 + */ +@Retention(RetentionPolicy.RUNTIME) +@Target(ElementType.TYPE) +public @interface CapabilityCore { + String value(); +} diff --git a/Partner-Core/src/main/java/work/slhaf/partner/core/cognation/capability/interfaces/Coordinated.java b/Partner-Core/src/main/java/work/slhaf/partner/core/cognation/capability/interfaces/Coordinated.java new file mode 100644 index 00000000..de29fdf1 --- /dev/null +++ b/Partner-Core/src/main/java/work/slhaf/partner/core/cognation/capability/interfaces/Coordinated.java @@ -0,0 +1,15 @@ +package work.slhaf.partner.core.cognation.capability.interfaces; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * 用于标注协调方法，`value`值需与对应的`@ToCoordinated`保持一致 + */ +@Retention(RetentionPolicy.RUNTIME) +@Target(ElementType.METHOD) +public @interface Coordinated { + String value(); +} diff --git a/Partner-Core/src/main/java/work/slhaf/partner/core/cognation/capability/interfaces/InjectCapability.java b/Partner-Core/src/main/java/work/slhaf/partner/core/cognation/capability/interfaces/InjectCapability.java new file mode 100644 index 00000000..acb57727 --- /dev/null +++ b/Partner-Core/src/main/java/work/slhaf/partner/core/cognation/capability/interfaces/InjectCapability.java @@ -0,0 +1,14 @@ +package work.slhaf.partner.core.cognation.capability.interfaces; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * 用于注入`Capability` + */ +@Target(ElementType.FIELD) +@Retention(RetentionPolicy.RUNTIME) +public @interface InjectCapability { +} diff --git a/Partner-Core/src/main/java/work/slhaf/partner/core/cognation/capability/interfaces/ToCoordinated.java b/Partner-Core/src/main/java/work/slhaf/partner/core/cognation/capability/interfaces/ToCoordinated.java new file mode 100644 index 00000000..dbaa036f --- /dev/null +++ b/Partner-Core/src/main/java/work/slhaf/partner/core/cognation/capability/interfaces/ToCoordinated.java @@ -0,0 +1,16 @@ +package work.slhaf.partner.core.cognation.capability.interfaces; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * 当`@Capability`所注接口中，如果存在方法需要协调多个Core服务的调用，可以通过该注解进行排除 + * value值为方法对应标识，需与协调实现处的方法标识保持一致 + */ +@Target(ElementType.METHOD) +@Retention(RetentionPolicy.RUNTIME) +public @interface ToCoordinated { + String value(); +} diff --git a/src/main/java/work/slhaf/agent/core/cognation/cognation/CognationCore.java b/Partner-Core/src/main/java/work/slhaf/partner/core/cognation/cognation/CognationCore.java similarity index 90% rename from src/main/java/work/slhaf/agent/core/cognation/cognation/CognationCore.java rename to Partner-Core/src/main/java/work/slhaf/partner/core/cognation/cognation/CognationCore.java index 02483c4c..2f3325e2 100644 --- a/src/main/java/work/slhaf/agent/core/cognation/cognation/CognationCore.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/core/cognation/cognation/CognationCore.java @@ -1,14 +1,14 @@ -package work.slhaf.agent.core.cognation.cognation; +package work.slhaf.partner.core.cognation.cognation; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.extern.slf4j.Slf4j; import org.apache.commons.io.FileUtils; -import work.slhaf.agent.common.chat.pojo.Message; -import work.slhaf.agent.common.serialize.PersistableObject; -import work.slhaf.agent.core.cognation.submodule.cache.CacheCore; -import work.slhaf.agent.core.cognation.submodule.memory.MemoryCore; -import work.slhaf.agent.core.cognation.submodule.perceive.PerceiveCore; +import work.slhaf.partner.common.chat.pojo.Message; +import work.slhaf.partner.common.serialize.PersistableObject; +import work.slhaf.partner.core.cognation.submodule.cache.CacheCore; +import work.slhaf.partner.core.cognation.submodule.memory.MemoryCore; +import work.slhaf.partner.core.cognation.submodule.perceive.PerceiveCore; import java.io.*; import java.nio.file.Files; diff --git a/src/main/java/work/slhaf/agent/core/cognation/cognation/exception/UserNotExistsException.java b/Partner-Core/src/main/java/work/slhaf/partner/core/cognation/cognation/exception/UserNotExistsException.java similarity index 70% rename from src/main/java/work/slhaf/agent/core/cognation/cognation/exception/UserNotExistsException.java rename to Partner-Core/src/main/java/work/slhaf/partner/core/cognation/cognation/exception/UserNotExistsException.java index a688636e..f80fd12d 100644 --- a/src/main/java/work/slhaf/agent/core/cognation/cognation/exception/UserNotExistsException.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/core/cognation/cognation/exception/UserNotExistsException.java @@ -1,4 +1,4 @@ -package work.slhaf.agent.core.cognation.cognation.exception; +package work.slhaf.partner.core.cognation.cognation.exception; public class UserNotExistsException extends RuntimeException { public UserNotExistsException(String message) { diff --git a/src/main/java/work/slhaf/agent/core/cognation/cognation/pojo/ActiveData.java b/Partner-Core/src/main/java/work/slhaf/partner/core/cognation/cognation/pojo/ActiveData.java similarity index 88% rename from src/main/java/work/slhaf/agent/core/cognation/cognation/pojo/ActiveData.java rename to Partner-Core/src/main/java/work/slhaf/partner/core/cognation/cognation/pojo/ActiveData.java index bb97363f..61a23a0b 100644 --- a/src/main/java/work/slhaf/agent/core/cognation/cognation/pojo/ActiveData.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/core/cognation/cognation/pojo/ActiveData.java @@ -1,7 +1,7 @@ -package work.slhaf.agent.core.cognation.cognation.pojo; +package work.slhaf.partner.core.cognation.cognation.pojo; import lombok.Data; -import work.slhaf.agent.core.cognation.submodule.memory.pojo.EvaluatedSlice; +import work.slhaf.partner.core.cognation.submodule.memory.pojo.EvaluatedSlice; import java.util.HashMap; import java.util.List; diff --git a/src/main/java/work/slhaf/agent/core/cognation/common/pojo/MemoryResult.java b/Partner-Core/src/main/java/work/slhaf/partner/core/cognation/common/pojo/MemoryResult.java similarity index 77% rename from src/main/java/work/slhaf/agent/core/cognation/common/pojo/MemoryResult.java rename to Partner-Core/src/main/java/work/slhaf/partner/core/cognation/common/pojo/MemoryResult.java index 1453ef48..45528557 100644 --- a/src/main/java/work/slhaf/agent/core/cognation/common/pojo/MemoryResult.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/core/cognation/common/pojo/MemoryResult.java @@ -1,9 +1,9 @@ -package work.slhaf.agent.core.cognation.common.pojo; +package work.slhaf.partner.core.cognation.common.pojo; import lombok.Data; import lombok.EqualsAndHashCode; -import work.slhaf.agent.common.serialize.PersistableObject; -import work.slhaf.agent.core.cognation.submodule.memory.pojo.MemorySlice; +import work.slhaf.partner.common.serialize.PersistableObject; +import work.slhaf.partner.core.cognation.submodule.memory.pojo.MemorySlice; import java.io.Serial; import java.util.List; diff --git a/src/main/java/work/slhaf/agent/core/cognation/common/pojo/MemorySliceResult.java b/Partner-Core/src/main/java/work/slhaf/partner/core/cognation/common/pojo/MemorySliceResult.java similarity index 71% rename from src/main/java/work/slhaf/agent/core/cognation/common/pojo/MemorySliceResult.java rename to Partner-Core/src/main/java/work/slhaf/partner/core/cognation/common/pojo/MemorySliceResult.java index 7d764a64..49922aad 100644 --- a/src/main/java/work/slhaf/agent/core/cognation/common/pojo/MemorySliceResult.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/core/cognation/common/pojo/MemorySliceResult.java @@ -1,10 +1,10 @@ -package work.slhaf.agent.core.cognation.common.pojo; +package work.slhaf.partner.core.cognation.common.pojo; import com.alibaba.fastjson2.annotation.JSONField; import lombok.Data; import lombok.EqualsAndHashCode; -import work.slhaf.agent.common.serialize.PersistableObject; -import work.slhaf.agent.core.cognation.submodule.memory.pojo.MemorySlice; +import work.slhaf.partner.common.serialize.PersistableObject; +import work.slhaf.partner.core.cognation.submodule.memory.pojo.MemorySlice; import java.io.Serial; diff --git a/src/main/java/work/slhaf/agent/core/cognation/submodule/cache/CacheCore.java b/Partner-Core/src/main/java/work/slhaf/partner/core/cognation/submodule/cache/CacheCore.java similarity index 92% rename from src/main/java/work/slhaf/agent/core/cognation/submodule/cache/CacheCore.java rename to Partner-Core/src/main/java/work/slhaf/partner/core/cognation/submodule/cache/CacheCore.java index 2dbe3f07..5efb984d 100644 --- a/src/main/java/work/slhaf/agent/core/cognation/submodule/cache/CacheCore.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/core/cognation/submodule/cache/CacheCore.java @@ -1,12 +1,11 @@ -package work.slhaf.agent.core.cognation.submodule.cache; +package work.slhaf.partner.core.cognation.submodule.cache; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.extern.slf4j.Slf4j; -import work.slhaf.agent.common.serialize.PersistableObject; -import work.slhaf.agent.core.cognation.capability.interfaces.CapabilityCore; -import work.slhaf.agent.core.cognation.common.pojo.MemoryResult; -import work.slhaf.agent.core.cognation.submodule.memory.pojo.MemorySlice; +import work.slhaf.partner.common.serialize.PersistableObject; +import work.slhaf.partner.core.cognation.common.pojo.MemoryResult; +import work.slhaf.partner.core.cognation.submodule.memory.pojo.MemorySlice; import java.io.Serial; import java.time.LocalDate; @@ -17,7 +16,6 @@ import java.util.concurrent.ConcurrentHashMap; @EqualsAndHashCode(callSuper = true) @Data @Slf4j -@CapabilityCore(value = "cache") public class CacheCore extends PersistableObject { @Serial diff --git a/src/main/java/work/slhaf/agent/core/cognation/submodule/dispatch/DispatchCore.java b/Partner-Core/src/main/java/work/slhaf/partner/core/cognation/submodule/dispatch/DispatchCore.java similarity index 75% rename from src/main/java/work/slhaf/agent/core/cognation/submodule/dispatch/DispatchCore.java rename to Partner-Core/src/main/java/work/slhaf/partner/core/cognation/submodule/dispatch/DispatchCore.java index 3f2ff198..b52734e3 100644 --- a/src/main/java/work/slhaf/agent/core/cognation/submodule/dispatch/DispatchCore.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/core/cognation/submodule/dispatch/DispatchCore.java @@ -1,7 +1,7 @@ -package work.slhaf.agent.core.cognation.submodule.dispatch; +package work.slhaf.partner.core.cognation.submodule.dispatch; -import work.slhaf.agent.common.serialize.PersistableObject; -import work.slhaf.agent.core.cognation.submodule.dispatch.pojo.DispatchData; +import work.slhaf.partner.common.serialize.PersistableObject; +import work.slhaf.partner.core.cognation.submodule.dispatch.pojo.DispatchData; import java.io.Serial; diff --git a/src/main/java/work/slhaf/agent/core/cognation/submodule/dispatch/pojo/DispatchData.java b/Partner-Core/src/main/java/work/slhaf/partner/core/cognation/submodule/dispatch/pojo/DispatchData.java similarity index 79% rename from src/main/java/work/slhaf/agent/core/cognation/submodule/dispatch/pojo/DispatchData.java rename to Partner-Core/src/main/java/work/slhaf/partner/core/cognation/submodule/dispatch/pojo/DispatchData.java index 04560722..9692e1be 100644 --- a/src/main/java/work/slhaf/agent/core/cognation/submodule/dispatch/pojo/DispatchData.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/core/cognation/submodule/dispatch/pojo/DispatchData.java @@ -1,4 +1,4 @@ -package work.slhaf.agent.core.cognation.submodule.dispatch.pojo; +package work.slhaf.partner.core.cognation.submodule.dispatch.pojo; import lombok.Data; diff --git a/src/main/java/work/slhaf/agent/core/cognation/submodule/memory/MemoryCore.java b/Partner-Core/src/main/java/work/slhaf/partner/core/cognation/submodule/memory/MemoryCore.java similarity index 94% rename from src/main/java/work/slhaf/agent/core/cognation/submodule/memory/MemoryCore.java rename to Partner-Core/src/main/java/work/slhaf/partner/core/cognation/submodule/memory/MemoryCore.java index 2722de71..60c85c88 100644 --- a/src/main/java/work/slhaf/agent/core/cognation/submodule/memory/MemoryCore.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/core/cognation/submodule/memory/MemoryCore.java @@ -1,15 +1,15 @@ -package work.slhaf.agent.core.cognation.submodule.memory; +package work.slhaf.partner.core.cognation.submodule.memory; import lombok.Data; import lombok.EqualsAndHashCode; -import work.slhaf.agent.common.serialize.PersistableObject; -import work.slhaf.agent.core.cognation.submodule.memory.exception.UnExistedDateIndexException; -import work.slhaf.agent.core.cognation.submodule.memory.exception.UnExistedTopicException; -import work.slhaf.agent.core.cognation.common.pojo.MemoryResult; -import work.slhaf.agent.core.cognation.common.pojo.MemorySliceResult; -import work.slhaf.agent.core.cognation.submodule.memory.pojo.MemorySlice; -import work.slhaf.agent.core.cognation.submodule.memory.pojo.node.MemoryNode; -import work.slhaf.agent.core.cognation.submodule.memory.pojo.node.TopicNode; +import work.slhaf.partner.common.serialize.PersistableObject; +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; +import work.slhaf.partner.core.cognation.submodule.memory.exception.UnExistedTopicException; +import work.slhaf.partner.core.cognation.submodule.memory.pojo.MemorySlice; +import work.slhaf.partner.core.cognation.submodule.memory.pojo.node.MemoryNode; +import work.slhaf.partner.core.cognation.submodule.memory.pojo.node.TopicNode; import java.io.IOException; import java.io.Serial; diff --git a/src/main/java/work/slhaf/agent/core/cognation/submodule/memory/exception/NullSliceListException.java b/Partner-Core/src/main/java/work/slhaf/partner/core/cognation/submodule/memory/exception/NullSliceListException.java similarity index 67% rename from src/main/java/work/slhaf/agent/core/cognation/submodule/memory/exception/NullSliceListException.java rename to Partner-Core/src/main/java/work/slhaf/partner/core/cognation/submodule/memory/exception/NullSliceListException.java index f8eafd8d..970af25b 100644 --- a/src/main/java/work/slhaf/agent/core/cognation/submodule/memory/exception/NullSliceListException.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/core/cognation/submodule/memory/exception/NullSliceListException.java @@ -1,4 +1,4 @@ -package work.slhaf.agent.core.cognation.submodule.memory.exception; +package work.slhaf.partner.core.cognation.submodule.memory.exception; public class NullSliceListException extends RuntimeException { public NullSliceListException(String message) { diff --git a/src/main/java/work/slhaf/agent/core/cognation/submodule/memory/exception/UnExistedDateIndexException.java b/Partner-Core/src/main/java/work/slhaf/partner/core/cognation/submodule/memory/exception/UnExistedDateIndexException.java similarity index 69% rename from src/main/java/work/slhaf/agent/core/cognation/submodule/memory/exception/UnExistedDateIndexException.java rename to Partner-Core/src/main/java/work/slhaf/partner/core/cognation/submodule/memory/exception/UnExistedDateIndexException.java index 6944cca2..053973f0 100644 --- a/src/main/java/work/slhaf/agent/core/cognation/submodule/memory/exception/UnExistedDateIndexException.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/core/cognation/submodule/memory/exception/UnExistedDateIndexException.java @@ -1,4 +1,4 @@ -package work.slhaf.agent.core.cognation.submodule.memory.exception; +package work.slhaf.partner.core.cognation.submodule.memory.exception; public class UnExistedDateIndexException extends RuntimeException { public UnExistedDateIndexException(String message) { diff --git a/src/main/java/work/slhaf/agent/core/cognation/submodule/memory/exception/UnExistedTopicException.java b/Partner-Core/src/main/java/work/slhaf/partner/core/cognation/submodule/memory/exception/UnExistedTopicException.java similarity index 68% rename from src/main/java/work/slhaf/agent/core/cognation/submodule/memory/exception/UnExistedTopicException.java rename to Partner-Core/src/main/java/work/slhaf/partner/core/cognation/submodule/memory/exception/UnExistedTopicException.java index 727d47e2..e84070d9 100644 --- a/src/main/java/work/slhaf/agent/core/cognation/submodule/memory/exception/UnExistedTopicException.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/core/cognation/submodule/memory/exception/UnExistedTopicException.java @@ -1,4 +1,4 @@ -package work.slhaf.agent.core.cognation.submodule.memory.exception; +package work.slhaf.partner.core.cognation.submodule.memory.exception; public class UnExistedTopicException extends RuntimeException { public UnExistedTopicException(String message) { diff --git a/src/main/java/work/slhaf/agent/core/cognation/submodule/memory/pojo/EvaluatedSlice.java b/Partner-Core/src/main/java/work/slhaf/partner/core/cognation/submodule/memory/pojo/EvaluatedSlice.java similarity index 76% rename from src/main/java/work/slhaf/agent/core/cognation/submodule/memory/pojo/EvaluatedSlice.java rename to Partner-Core/src/main/java/work/slhaf/partner/core/cognation/submodule/memory/pojo/EvaluatedSlice.java index eb746db4..2e37ded7 100644 --- a/src/main/java/work/slhaf/agent/core/cognation/submodule/memory/pojo/EvaluatedSlice.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/core/cognation/submodule/memory/pojo/EvaluatedSlice.java @@ -1,9 +1,9 @@ -package work.slhaf.agent.core.cognation.submodule.memory.pojo; +package work.slhaf.partner.core.cognation.submodule.memory.pojo; import lombok.Builder; import lombok.Data; import lombok.EqualsAndHashCode; -import work.slhaf.agent.common.serialize.PersistableObject; +import work.slhaf.partner.common.serialize.PersistableObject; import java.io.Serial; import java.time.LocalDate; diff --git a/src/main/java/work/slhaf/agent/core/cognation/submodule/memory/pojo/MemorySlice.java b/Partner-Core/src/main/java/work/slhaf/partner/core/cognation/submodule/memory/pojo/MemorySlice.java similarity index 90% rename from src/main/java/work/slhaf/agent/core/cognation/submodule/memory/pojo/MemorySlice.java rename to Partner-Core/src/main/java/work/slhaf/partner/core/cognation/submodule/memory/pojo/MemorySlice.java index 9662873b..4409cb27 100644 --- a/src/main/java/work/slhaf/agent/core/cognation/submodule/memory/pojo/MemorySlice.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/core/cognation/submodule/memory/pojo/MemorySlice.java @@ -1,10 +1,10 @@ -package work.slhaf.agent.core.cognation.submodule.memory.pojo; +package work.slhaf.partner.core.cognation.submodule.memory.pojo; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; -import work.slhaf.agent.common.chat.pojo.Message; -import work.slhaf.agent.common.serialize.PersistableObject; +import work.slhaf.partner.common.chat.pojo.Message; +import work.slhaf.partner.common.serialize.PersistableObject; import java.io.Serial; import java.util.List; diff --git a/src/main/java/work/slhaf/agent/core/cognation/submodule/memory/pojo/node/MemoryNode.java b/Partner-Core/src/main/java/work/slhaf/partner/core/cognation/submodule/memory/pojo/node/MemoryNode.java similarity index 89% rename from src/main/java/work/slhaf/agent/core/cognation/submodule/memory/pojo/node/MemoryNode.java rename to Partner-Core/src/main/java/work/slhaf/partner/core/cognation/submodule/memory/pojo/node/MemoryNode.java index 1a58b3c8..991e2565 100644 --- a/src/main/java/work/slhaf/agent/core/cognation/submodule/memory/pojo/node/MemoryNode.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/core/cognation/submodule/memory/pojo/node/MemoryNode.java @@ -1,11 +1,11 @@ -package work.slhaf.agent.core.cognation.submodule.memory.pojo.node; +package work.slhaf.partner.core.cognation.submodule.memory.pojo.node; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.extern.slf4j.Slf4j; -import work.slhaf.agent.common.serialize.PersistableObject; -import work.slhaf.agent.core.cognation.submodule.memory.exception.NullSliceListException; -import work.slhaf.agent.core.cognation.submodule.memory.pojo.MemorySlice; +import work.slhaf.partner.common.serialize.PersistableObject; +import work.slhaf.partner.core.cognation.submodule.memory.exception.NullSliceListException; +import work.slhaf.partner.core.cognation.submodule.memory.pojo.MemorySlice; import java.io.*; import java.nio.file.Files; diff --git a/src/main/java/work/slhaf/agent/core/cognation/submodule/memory/pojo/node/TopicNode.java b/Partner-Core/src/main/java/work/slhaf/partner/core/cognation/submodule/memory/pojo/node/TopicNode.java similarity index 79% rename from src/main/java/work/slhaf/agent/core/cognation/submodule/memory/pojo/node/TopicNode.java rename to Partner-Core/src/main/java/work/slhaf/partner/core/cognation/submodule/memory/pojo/node/TopicNode.java index e3050a1b..b16a5ff1 100644 --- a/src/main/java/work/slhaf/agent/core/cognation/submodule/memory/pojo/node/TopicNode.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/core/cognation/submodule/memory/pojo/node/TopicNode.java @@ -1,8 +1,8 @@ -package work.slhaf.agent.core.cognation.submodule.memory.pojo.node; +package work.slhaf.partner.core.cognation.submodule.memory.pojo.node; import lombok.Data; import lombok.EqualsAndHashCode; -import work.slhaf.agent.common.serialize.PersistableObject; +import work.slhaf.partner.common.serialize.PersistableObject; import java.io.Serial; import java.util.concurrent.ConcurrentHashMap; diff --git a/src/main/java/work/slhaf/agent/core/cognation/submodule/perceive/PerceiveCore.java b/Partner-Core/src/main/java/work/slhaf/partner/core/cognation/submodule/perceive/PerceiveCore.java similarity index 92% rename from src/main/java/work/slhaf/agent/core/cognation/submodule/perceive/PerceiveCore.java rename to Partner-Core/src/main/java/work/slhaf/partner/core/cognation/submodule/perceive/PerceiveCore.java index ea91d825..59b92c40 100644 --- a/src/main/java/work/slhaf/agent/core/cognation/submodule/perceive/PerceiveCore.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/core/cognation/submodule/perceive/PerceiveCore.java @@ -1,9 +1,9 @@ -package work.slhaf.agent.core.cognation.submodule.perceive; +package work.slhaf.partner.core.cognation.submodule.perceive; import lombok.Data; import lombok.EqualsAndHashCode; -import work.slhaf.agent.common.serialize.PersistableObject; -import work.slhaf.agent.core.cognation.submodule.perceive.pojo.User; +import work.slhaf.partner.common.serialize.PersistableObject; +import work.slhaf.partner.core.cognation.submodule.perceive.pojo.User; import java.io.Serial; import java.util.ArrayList; diff --git a/src/main/java/work/slhaf/agent/core/cognation/submodule/perceive/pojo/User.java b/Partner-Core/src/main/java/work/slhaf/partner/core/cognation/submodule/perceive/pojo/User.java similarity index 92% rename from src/main/java/work/slhaf/agent/core/cognation/submodule/perceive/pojo/User.java rename to Partner-Core/src/main/java/work/slhaf/partner/core/cognation/submodule/perceive/pojo/User.java index d575af0f..3e3b3e8d 100644 --- a/src/main/java/work/slhaf/agent/core/cognation/submodule/perceive/pojo/User.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/core/cognation/submodule/perceive/pojo/User.java @@ -1,8 +1,8 @@ -package work.slhaf.agent.core.cognation.submodule.perceive.pojo; +package work.slhaf.partner.core.cognation.submodule.perceive.pojo; import lombok.Data; import lombok.EqualsAndHashCode; -import work.slhaf.agent.common.serialize.PersistableObject; +import work.slhaf.partner.common.serialize.PersistableObject; import java.io.Serial; import java.time.LocalDate; diff --git a/src/main/java/work/slhaf/agent/core/interaction/agent_interface/InputReceiver.java b/Partner-Core/src/main/java/work/slhaf/partner/core/interaction/agent_interface/InputReceiver.java similarity index 55% rename from src/main/java/work/slhaf/agent/core/interaction/agent_interface/InputReceiver.java rename to Partner-Core/src/main/java/work/slhaf/partner/core/interaction/agent_interface/InputReceiver.java index 5bba5df1..1a06ae60 100644 --- a/src/main/java/work/slhaf/agent/core/interaction/agent_interface/InputReceiver.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/core/interaction/agent_interface/InputReceiver.java @@ -1,6 +1,7 @@ -package work.slhaf.agent.core.interaction.agent_interface; +package work.slhaf.partner.core.interaction.agent_interface; -import work.slhaf.agent.core.interaction.data.InteractionInputData; + +import work.slhaf.partner.core.interaction.data.InteractionInputData; import java.io.IOException; diff --git a/src/main/java/work/slhaf/agent/core/interaction/agent_interface/TaskCallback.java b/Partner-Core/src/main/java/work/slhaf/partner/core/interaction/agent_interface/TaskCallback.java similarity index 59% rename from src/main/java/work/slhaf/agent/core/interaction/agent_interface/TaskCallback.java rename to Partner-Core/src/main/java/work/slhaf/partner/core/interaction/agent_interface/TaskCallback.java index e96759ad..9e1767c4 100644 --- a/src/main/java/work/slhaf/agent/core/interaction/agent_interface/TaskCallback.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/core/interaction/agent_interface/TaskCallback.java @@ -1,4 +1,4 @@ -package work.slhaf.agent.core.interaction.agent_interface; +package work.slhaf.partner.core.interaction.agent_interface; public interface TaskCallback { void onTaskFinished(String userInfo,String output); diff --git a/src/main/java/work/slhaf/agent/core/interaction/data/InteractionInputData.java b/Partner-Core/src/main/java/work/slhaf/partner/core/interaction/data/InteractionInputData.java similarity index 85% rename from src/main/java/work/slhaf/agent/core/interaction/data/InteractionInputData.java rename to Partner-Core/src/main/java/work/slhaf/partner/core/interaction/data/InteractionInputData.java index d58e218a..41f32f76 100644 --- a/src/main/java/work/slhaf/agent/core/interaction/data/InteractionInputData.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/core/interaction/data/InteractionInputData.java @@ -1,4 +1,4 @@ -package work.slhaf.agent.core.interaction.data; +package work.slhaf.partner.core.interaction.data; import lombok.Data; diff --git a/src/main/java/work/slhaf/agent/core/interaction/data/InteractionOutputData.java b/Partner-Core/src/main/java/work/slhaf/partner/core/interaction/data/InteractionOutputData.java similarity index 78% rename from src/main/java/work/slhaf/agent/core/interaction/data/InteractionOutputData.java rename to Partner-Core/src/main/java/work/slhaf/partner/core/interaction/data/InteractionOutputData.java index 8ff83cd9..c9fea2ba 100644 --- a/src/main/java/work/slhaf/agent/core/interaction/data/InteractionOutputData.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/core/interaction/data/InteractionOutputData.java @@ -1,4 +1,4 @@ -package work.slhaf.agent.core.interaction.data; +package work.slhaf.partner.core.interaction.data; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/work/slhaf/agent/core/interaction/data/context/InteractionContext.java b/Partner-Core/src/main/java/work/slhaf/partner/core/interaction/data/context/InteractionContext.java similarity index 81% rename from src/main/java/work/slhaf/agent/core/interaction/data/context/InteractionContext.java rename to Partner-Core/src/main/java/work/slhaf/partner/core/interaction/data/context/InteractionContext.java index 4c279198..f81b45f2 100644 --- a/src/main/java/work/slhaf/agent/core/interaction/data/context/InteractionContext.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/core/interaction/data/context/InteractionContext.java @@ -1,12 +1,12 @@ -package work.slhaf.agent.core.interaction.data.context; +package work.slhaf.partner.core.interaction.data.context; import com.alibaba.fastjson2.JSONObject; import lombok.Data; import lombok.EqualsAndHashCode; -import work.slhaf.agent.common.serialize.PersistableObject; -import work.slhaf.agent.core.interaction.data.context.subcontext.CoreContext; -import work.slhaf.agent.core.interaction.data.context.subcontext.ModuleContext; -import work.slhaf.agent.module.common.AppendPromptData; +import work.slhaf.partner.common.serialize.PersistableObject; +import work.slhaf.partner.core.interaction.data.context.subcontext.CoreContext; +import work.slhaf.partner.core.interaction.data.context.subcontext.ModuleContext; +import work.slhaf.partner.module.common.AppendPromptData; import java.io.Serial; import java.time.LocalDateTime; diff --git a/src/main/java/work/slhaf/agent/core/interaction/data/context/subcontext/CoreContext.java b/Partner-Core/src/main/java/work/slhaf/partner/core/interaction/data/context/subcontext/CoreContext.java similarity index 85% rename from src/main/java/work/slhaf/agent/core/interaction/data/context/subcontext/CoreContext.java rename to Partner-Core/src/main/java/work/slhaf/partner/core/interaction/data/context/subcontext/CoreContext.java index b15e0215..8cf4654e 100644 --- a/src/main/java/work/slhaf/agent/core/interaction/data/context/subcontext/CoreContext.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/core/interaction/data/context/subcontext/CoreContext.java @@ -1,9 +1,9 @@ -package work.slhaf.agent.core.interaction.data.context.subcontext; +package work.slhaf.partner.core.interaction.data.context.subcontext; import com.alibaba.fastjson2.JSONObject; import lombok.Data; import lombok.EqualsAndHashCode; -import work.slhaf.agent.common.serialize.PersistableObject; +import work.slhaf.partner.common.serialize.PersistableObject; import java.io.Serial; import java.util.HashMap; diff --git a/src/main/java/work/slhaf/agent/core/interaction/data/context/subcontext/ModuleContext.java b/Partner-Core/src/main/java/work/slhaf/partner/core/interaction/data/context/subcontext/ModuleContext.java similarity index 72% rename from src/main/java/work/slhaf/agent/core/interaction/data/context/subcontext/ModuleContext.java rename to Partner-Core/src/main/java/work/slhaf/partner/core/interaction/data/context/subcontext/ModuleContext.java index ae70e1da..529b8ff6 100644 --- a/src/main/java/work/slhaf/agent/core/interaction/data/context/subcontext/ModuleContext.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/core/interaction/data/context/subcontext/ModuleContext.java @@ -1,10 +1,10 @@ -package work.slhaf.agent.core.interaction.data.context.subcontext; +package work.slhaf.partner.core.interaction.data.context.subcontext; import com.alibaba.fastjson2.JSONObject; import lombok.Data; import lombok.EqualsAndHashCode; -import work.slhaf.agent.common.serialize.PersistableObject; -import work.slhaf.agent.module.common.AppendPromptData; +import work.slhaf.partner.common.serialize.PersistableObject; +import work.slhaf.partner.module.common.AppendPromptData; import java.io.Serial; import java.util.ArrayList; diff --git a/src/main/java/work/slhaf/agent/core/interaction/module/InteractionModule.java b/Partner-Core/src/main/java/work/slhaf/partner/core/interaction/module/InteractionModule.java similarity index 55% rename from src/main/java/work/slhaf/agent/core/interaction/module/InteractionModule.java rename to Partner-Core/src/main/java/work/slhaf/partner/core/interaction/module/InteractionModule.java index 2d0b98d8..e938fe83 100644 --- a/src/main/java/work/slhaf/agent/core/interaction/module/InteractionModule.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/core/interaction/module/InteractionModule.java @@ -1,6 +1,6 @@ -package work.slhaf.agent.core.interaction.module; +package work.slhaf.partner.core.interaction.module; -import work.slhaf.agent.core.interaction.data.context.InteractionContext; +import work.slhaf.partner.core.interaction.data.context.InteractionContext; import java.io.IOException; diff --git a/src/main/java/work/slhaf/agent/core/interaction/module/InteractionModulesLoader.java b/Partner-Core/src/main/java/work/slhaf/partner/core/interaction/module/InteractionModulesLoader.java similarity index 94% rename from src/main/java/work/slhaf/agent/core/interaction/module/InteractionModulesLoader.java rename to Partner-Core/src/main/java/work/slhaf/partner/core/interaction/module/InteractionModulesLoader.java index e904bb2b..8ad389c2 100644 --- a/src/main/java/work/slhaf/agent/core/interaction/module/InteractionModulesLoader.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/core/interaction/module/InteractionModulesLoader.java @@ -1,7 +1,7 @@ -package work.slhaf.agent.core.interaction.module; +package work.slhaf.partner.core.interaction.module; -import work.slhaf.agent.common.config.Config; -import work.slhaf.agent.common.config.ModuleConfig; +import work.slhaf.partner.common.config.Config; +import work.slhaf.partner.common.config.ModuleConfig; import java.io.File; import java.io.IOException; diff --git a/src/main/java/work/slhaf/agent/core/session/SessionManager.java b/Partner-Core/src/main/java/work/slhaf/partner/core/session/SessionManager.java similarity index 94% rename from src/main/java/work/slhaf/agent/core/session/SessionManager.java rename to Partner-Core/src/main/java/work/slhaf/partner/core/session/SessionManager.java index 494b18a6..24de47f5 100644 --- a/src/main/java/work/slhaf/agent/core/session/SessionManager.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/core/session/SessionManager.java @@ -1,13 +1,13 @@ -package work.slhaf.agent.core.session; +package work.slhaf.partner.core.session; import com.alibaba.fastjson2.JSONObject; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.extern.slf4j.Slf4j; -import work.slhaf.agent.common.chat.pojo.Message; -import work.slhaf.agent.common.chat.pojo.MetaMessage; -import work.slhaf.agent.common.config.Config; -import work.slhaf.agent.common.serialize.PersistableObject; +import work.slhaf.partner.common.chat.pojo.Message; +import work.slhaf.partner.common.chat.pojo.MetaMessage; +import work.slhaf.partner.common.config.Config; +import work.slhaf.partner.common.serialize.PersistableObject; import java.io.*; import java.nio.file.Files; diff --git a/src/main/java/work/slhaf/agent/gateway/AgentWebSocketServer.java b/Partner-Core/src/main/java/work/slhaf/partner/gateway/AgentWebSocketServer.java similarity index 93% rename from src/main/java/work/slhaf/agent/gateway/AgentWebSocketServer.java rename to Partner-Core/src/main/java/work/slhaf/partner/gateway/AgentWebSocketServer.java index d85870b1..faffbbd2 100644 --- a/src/main/java/work/slhaf/agent/gateway/AgentWebSocketServer.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/gateway/AgentWebSocketServer.java @@ -1,4 +1,4 @@ -package work.slhaf.agent.gateway; +package work.slhaf.partner.gateway; import cn.hutool.json.JSONUtil; import com.alibaba.fastjson2.JSONObject; @@ -8,10 +8,10 @@ import org.java_websocket.WebSocket; import org.java_websocket.framing.Framedata; import org.java_websocket.handshake.ClientHandshake; import org.java_websocket.server.WebSocketServer; -import work.slhaf.agent.common.thread.InteractionThreadPoolExecutor; -import work.slhaf.agent.core.interaction.agent_interface.InputReceiver; -import work.slhaf.agent.core.interaction.data.InteractionInputData; -import work.slhaf.agent.core.interaction.data.InteractionOutputData; +import work.slhaf.partner.common.thread.InteractionThreadPoolExecutor; +import work.slhaf.partner.core.interaction.agent_interface.InputReceiver; +import work.slhaf.partner.core.interaction.data.InteractionInputData; +import work.slhaf.partner.core.interaction.data.InteractionOutputData; import java.io.IOException; import java.net.InetSocketAddress; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/gateway/MessageSender.java b/Partner-Core/src/main/java/work/slhaf/partner/gateway/MessageSender.java new file mode 100644 index 00000000..0c3af117 --- /dev/null +++ b/Partner-Core/src/main/java/work/slhaf/partner/gateway/MessageSender.java @@ -0,0 +1,7 @@ +package work.slhaf.partner.gateway; + +import work.slhaf.partner.core.interaction.data.InteractionOutputData; + +public interface MessageSender { + void sendMessage(InteractionOutputData outputData); +} diff --git a/src/main/java/work/slhaf/agent/module/common/AppendPromptData.java b/Partner-Core/src/main/java/work/slhaf/partner/module/common/AppendPromptData.java similarity index 77% rename from src/main/java/work/slhaf/agent/module/common/AppendPromptData.java rename to Partner-Core/src/main/java/work/slhaf/partner/module/common/AppendPromptData.java index 824af7c6..372e5778 100644 --- a/src/main/java/work/slhaf/agent/module/common/AppendPromptData.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/common/AppendPromptData.java @@ -1,8 +1,8 @@ -package work.slhaf.agent.module.common; +package work.slhaf.partner.module.common; import lombok.Data; import lombok.EqualsAndHashCode; -import work.slhaf.agent.common.serialize.PersistableObject; +import work.slhaf.partner.common.serialize.PersistableObject; import java.io.Serial; import java.util.HashMap; diff --git a/src/main/java/work/slhaf/agent/module/common/Model.java b/Partner-Core/src/main/java/work/slhaf/partner/module/common/Model.java similarity index 78% rename from src/main/java/work/slhaf/agent/module/common/Model.java rename to Partner-Core/src/main/java/work/slhaf/partner/module/common/Model.java index 31794292..737b8686 100644 --- a/src/main/java/work/slhaf/agent/module/common/Model.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/common/Model.java @@ -1,12 +1,12 @@ -package work.slhaf.agent.module.common; +package work.slhaf.partner.module.common; import lombok.Data; -import work.slhaf.agent.common.chat.ChatClient; -import work.slhaf.agent.common.chat.constant.ChatConstant; -import work.slhaf.agent.common.chat.pojo.ChatResponse; -import work.slhaf.agent.common.chat.pojo.Message; -import work.slhaf.agent.common.config.ModelConfig; -import work.slhaf.agent.common.util.ResourcesUtil; +import work.slhaf.partner.common.chat.ChatClient; +import work.slhaf.partner.common.chat.constant.ChatConstant; +import work.slhaf.partner.common.chat.pojo.ChatResponse; +import work.slhaf.partner.common.chat.pojo.Message; +import work.slhaf.partner.common.config.ModelConfig; +import work.slhaf.partner.common.util.ResourcesUtil; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/work/slhaf/agent/module/common/ModelConstant.java b/Partner-Core/src/main/java/work/slhaf/partner/module/common/ModelConstant.java similarity index 90% rename from src/main/java/work/slhaf/agent/module/common/ModelConstant.java rename to Partner-Core/src/main/java/work/slhaf/partner/module/common/ModelConstant.java index ba578804..7939019a 100644 --- a/src/main/java/work/slhaf/agent/module/common/ModelConstant.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/common/ModelConstant.java @@ -1,4 +1,4 @@ -package work.slhaf.agent.module.common; +package work.slhaf.partner.module.common; public class ModelConstant { diff --git a/src/main/java/work/slhaf/agent/module/common/PreModule.java b/Partner-Core/src/main/java/work/slhaf/partner/module/common/PreModule.java similarity index 79% rename from src/main/java/work/slhaf/agent/module/common/PreModule.java rename to Partner-Core/src/main/java/work/slhaf/partner/module/common/PreModule.java index cae61971..c7186787 100644 --- a/src/main/java/work/slhaf/agent/module/common/PreModule.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/common/PreModule.java @@ -1,7 +1,7 @@ -package work.slhaf.agent.module.common; +package work.slhaf.partner.module.common; -import work.slhaf.agent.core.interaction.data.context.InteractionContext; -import work.slhaf.agent.core.interaction.module.InteractionModule; +import work.slhaf.partner.core.interaction.data.context.InteractionContext; +import work.slhaf.partner.core.interaction.module.InteractionModule; import java.util.HashMap; diff --git a/src/main/java/work/slhaf/agent/module/modules/core/CoreModel.java b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/core/CoreModel.java similarity index 91% rename from src/main/java/work/slhaf/agent/module/modules/core/CoreModel.java rename to Partner-Core/src/main/java/work/slhaf/partner/module/modules/core/CoreModel.java index 3bce7663..11ce036d 100644 --- a/src/main/java/work/slhaf/agent/module/modules/core/CoreModel.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/core/CoreModel.java @@ -1,21 +1,21 @@ -package work.slhaf.agent.module.modules.core; +package work.slhaf.partner.module.modules.core; import com.alibaba.fastjson2.JSONObject; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.extern.slf4j.Slf4j; -import work.slhaf.agent.common.chat.constant.ChatConstant; -import work.slhaf.agent.common.chat.pojo.ChatResponse; -import work.slhaf.agent.common.chat.pojo.Message; -import work.slhaf.agent.common.chat.pojo.MetaMessage; -import work.slhaf.agent.core.cognation.capability.ability.CognationCapability; -import work.slhaf.agent.core.cognation.CognationManager; -import work.slhaf.agent.core.interaction.data.context.InteractionContext; -import work.slhaf.agent.core.interaction.module.InteractionModule; -import work.slhaf.agent.core.session.SessionManager; -import work.slhaf.agent.module.common.AppendPromptData; -import work.slhaf.agent.module.common.Model; -import work.slhaf.agent.module.common.ModelConstant; +import work.slhaf.partner.common.chat.constant.ChatConstant; +import work.slhaf.partner.common.chat.pojo.ChatResponse; +import work.slhaf.partner.common.chat.pojo.Message; +import work.slhaf.partner.common.chat.pojo.MetaMessage; +import work.slhaf.partner.core.cognation.CognationManager; +import work.slhaf.partner.core.cognation.capability.ability.CognationCapability; +import work.slhaf.partner.core.interaction.data.context.InteractionContext; +import work.slhaf.partner.core.interaction.module.InteractionModule; +import work.slhaf.partner.core.session.SessionManager; +import work.slhaf.partner.module.common.AppendPromptData; +import work.slhaf.partner.module.common.Model; +import work.slhaf.partner.module.common.ModelConstant; import java.io.IOException; import java.time.LocalDateTime; @@ -23,7 +23,7 @@ import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.List; -import static work.slhaf.agent.common.util.ExtractUtil.extractJson; +import static work.slhaf.partner.common.util.ExtractUtil.extractJson; @EqualsAndHashCode(callSuper = true) @Data diff --git a/src/main/java/work/slhaf/agent/module/modules/memory/selector/MemorySelector.java b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/selector/MemorySelector.java similarity index 84% rename from src/main/java/work/slhaf/agent/module/modules/memory/selector/MemorySelector.java rename to Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/selector/MemorySelector.java index ff53efc7..6c59c334 100644 --- a/src/main/java/work/slhaf/agent/module/modules/memory/selector/MemorySelector.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/selector/MemorySelector.java @@ -1,25 +1,25 @@ -package work.slhaf.agent.module.modules.memory.selector; +package work.slhaf.partner.module.modules.memory.selector; import com.alibaba.fastjson2.JSONObject; import lombok.Data; import lombok.extern.slf4j.Slf4j; -import work.slhaf.agent.core.cognation.capability.ability.CognationCapability; -import work.slhaf.agent.core.cognation.CognationManager; -import work.slhaf.agent.core.cognation.submodule.memory.exception.UnExistedDateIndexException; -import work.slhaf.agent.core.cognation.submodule.memory.exception.UnExistedTopicException; -import work.slhaf.agent.core.cognation.common.pojo.MemoryResult; -import work.slhaf.agent.core.cognation.capability.ability.CacheCapability; -import work.slhaf.agent.core.cognation.capability.ability.MemoryCapability; -import work.slhaf.agent.core.cognation.submodule.memory.pojo.MemorySlice; -import work.slhaf.agent.core.interaction.data.context.InteractionContext; -import work.slhaf.agent.core.session.SessionManager; -import work.slhaf.agent.module.common.PreModule; -import work.slhaf.agent.module.modules.memory.selector.evaluator.SliceSelectEvaluator; -import work.slhaf.agent.module.modules.memory.selector.evaluator.data.EvaluatorInput; -import work.slhaf.agent.module.modules.memory.selector.extractor.MemorySelectExtractor; -import work.slhaf.agent.module.modules.memory.selector.extractor.data.ExtractorMatchData; -import work.slhaf.agent.module.modules.memory.selector.extractor.data.ExtractorResult; -import work.slhaf.agent.core.cognation.submodule.memory.pojo.EvaluatedSlice; +import work.slhaf.partner.core.cognation.capability.ability.CognationCapability; +import work.slhaf.partner.core.cognation.CognationManager; +import work.slhaf.partner.core.cognation.submodule.memory.exception.UnExistedDateIndexException; +import work.slhaf.partner.core.cognation.submodule.memory.exception.UnExistedTopicException; +import work.slhaf.partner.core.cognation.common.pojo.MemoryResult; +import work.slhaf.partner.core.cognation.capability.ability.CacheCapability; +import work.slhaf.partner.core.cognation.capability.ability.MemoryCapability; +import work.slhaf.partner.core.cognation.submodule.memory.pojo.MemorySlice; +import work.slhaf.partner.core.interaction.data.context.InteractionContext; +import work.slhaf.partner.core.session.SessionManager; +import work.slhaf.partner.module.common.PreModule; +import work.slhaf.partner.module.modules.memory.selector.evaluator.SliceSelectEvaluator; +import work.slhaf.partner.module.modules.memory.selector.evaluator.data.EvaluatorInput; +import work.slhaf.partner.module.modules.memory.selector.extractor.MemorySelectExtractor; +import work.slhaf.partner.module.modules.memory.selector.extractor.data.ExtractorMatchData; +import work.slhaf.partner.module.modules.memory.selector.extractor.data.ExtractorResult; +import work.slhaf.partner.core.cognation.submodule.memory.pojo.EvaluatedSlice; import java.io.IOException; import java.time.LocalDate; diff --git a/src/main/java/work/slhaf/agent/module/modules/memory/selector/evaluator/SliceSelectEvaluator.java b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/selector/evaluator/SliceSelectEvaluator.java similarity index 86% rename from src/main/java/work/slhaf/agent/module/modules/memory/selector/evaluator/SliceSelectEvaluator.java rename to Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/selector/evaluator/SliceSelectEvaluator.java index 75e8d6b5..30918164 100644 --- a/src/main/java/work/slhaf/agent/module/modules/memory/selector/evaluator/SliceSelectEvaluator.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/selector/evaluator/SliceSelectEvaluator.java @@ -1,4 +1,4 @@ -package work.slhaf.agent.module.modules.memory.selector.evaluator; +package work.slhaf.partner.module.modules.memory.selector.evaluator; import cn.hutool.core.date.DateUtil; import cn.hutool.json.JSONUtil; @@ -6,17 +6,17 @@ import com.alibaba.fastjson2.JSONObject; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.extern.slf4j.Slf4j; -import work.slhaf.agent.common.thread.InteractionThreadPoolExecutor; -import work.slhaf.agent.core.cognation.common.pojo.MemoryResult; -import work.slhaf.agent.core.cognation.common.pojo.MemorySliceResult; -import work.slhaf.agent.core.cognation.submodule.memory.pojo.MemorySlice; -import work.slhaf.agent.module.common.Model; -import work.slhaf.agent.module.common.ModelConstant; -import work.slhaf.agent.module.modules.memory.selector.evaluator.data.EvaluatorBatchInput; -import work.slhaf.agent.module.modules.memory.selector.evaluator.data.EvaluatorInput; -import work.slhaf.agent.module.modules.memory.selector.evaluator.data.EvaluatorResult; -import work.slhaf.agent.module.modules.memory.selector.evaluator.data.SliceSummary; -import work.slhaf.agent.core.cognation.submodule.memory.pojo.EvaluatedSlice; +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; +import work.slhaf.partner.core.cognation.submodule.memory.pojo.MemorySlice; +import work.slhaf.partner.module.common.Model; +import work.slhaf.partner.module.common.ModelConstant; +import work.slhaf.partner.module.modules.memory.selector.evaluator.data.EvaluatorBatchInput; +import work.slhaf.partner.module.modules.memory.selector.evaluator.data.EvaluatorInput; +import work.slhaf.partner.module.modules.memory.selector.evaluator.data.EvaluatorResult; +import work.slhaf.partner.module.modules.memory.selector.evaluator.data.SliceSummary; +import work.slhaf.partner.core.cognation.submodule.memory.pojo.EvaluatedSlice; import java.io.IOException; import java.util.*; @@ -25,7 +25,7 @@ import java.util.concurrent.ConcurrentLinkedDeque; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import static work.slhaf.agent.common.util.ExtractUtil.extractJson; +import static work.slhaf.partner.common.util.ExtractUtil.extractJson; @EqualsAndHashCode(callSuper = true) @Data diff --git a/src/main/java/work/slhaf/agent/module/modules/memory/selector/evaluator/data/EvaluatorBatchInput.java b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/selector/evaluator/data/EvaluatorBatchInput.java similarity index 64% rename from src/main/java/work/slhaf/agent/module/modules/memory/selector/evaluator/data/EvaluatorBatchInput.java rename to Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/selector/evaluator/data/EvaluatorBatchInput.java index b2d7172a..c21a13d4 100644 --- a/src/main/java/work/slhaf/agent/module/modules/memory/selector/evaluator/data/EvaluatorBatchInput.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/selector/evaluator/data/EvaluatorBatchInput.java @@ -1,8 +1,8 @@ -package work.slhaf.agent.module.modules.memory.selector.evaluator.data; +package work.slhaf.partner.module.modules.memory.selector.evaluator.data; import lombok.Builder; import lombok.Data; -import work.slhaf.agent.common.chat.pojo.Message; +import work.slhaf.partner.common.chat.pojo.Message; import java.util.List; diff --git a/src/main/java/work/slhaf/agent/module/modules/memory/selector/evaluator/data/EvaluatorInput.java b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/selector/evaluator/data/EvaluatorInput.java similarity index 53% rename from src/main/java/work/slhaf/agent/module/modules/memory/selector/evaluator/data/EvaluatorInput.java rename to Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/selector/evaluator/data/EvaluatorInput.java index c2a0db46..defaf878 100644 --- a/src/main/java/work/slhaf/agent/module/modules/memory/selector/evaluator/data/EvaluatorInput.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/selector/evaluator/data/EvaluatorInput.java @@ -1,9 +1,9 @@ -package work.slhaf.agent.module.modules.memory.selector.evaluator.data; +package work.slhaf.partner.module.modules.memory.selector.evaluator.data; import lombok.Builder; import lombok.Data; -import work.slhaf.agent.common.chat.pojo.Message; -import work.slhaf.agent.core.cognation.common.pojo.MemoryResult; +import work.slhaf.partner.common.chat.pojo.Message; +import work.slhaf.partner.core.cognation.common.pojo.MemoryResult; import java.util.List; diff --git a/src/main/java/work/slhaf/agent/module/modules/memory/selector/evaluator/data/EvaluatorResult.java b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/selector/evaluator/data/EvaluatorResult.java similarity index 61% rename from src/main/java/work/slhaf/agent/module/modules/memory/selector/evaluator/data/EvaluatorResult.java rename to Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/selector/evaluator/data/EvaluatorResult.java index ae0c9b4c..426ebb31 100644 --- a/src/main/java/work/slhaf/agent/module/modules/memory/selector/evaluator/data/EvaluatorResult.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/selector/evaluator/data/EvaluatorResult.java @@ -1,4 +1,4 @@ -package work.slhaf.agent.module.modules.memory.selector.evaluator.data; +package work.slhaf.partner.module.modules.memory.selector.evaluator.data; import lombok.Data; diff --git a/src/main/java/work/slhaf/agent/module/modules/memory/selector/evaluator/data/SliceSummary.java b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/selector/evaluator/data/SliceSummary.java similarity index 68% rename from src/main/java/work/slhaf/agent/module/modules/memory/selector/evaluator/data/SliceSummary.java rename to Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/selector/evaluator/data/SliceSummary.java index de7fac93..6335149d 100644 --- a/src/main/java/work/slhaf/agent/module/modules/memory/selector/evaluator/data/SliceSummary.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/selector/evaluator/data/SliceSummary.java @@ -1,4 +1,4 @@ -package work.slhaf.agent.module.modules.memory.selector.evaluator.data; +package work.slhaf.partner.module.modules.memory.selector.evaluator.data; import lombok.Data; diff --git a/src/main/java/work/slhaf/agent/module/modules/memory/selector/extractor/MemorySelectExtractor.java b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/selector/extractor/MemorySelectExtractor.java similarity index 75% rename from src/main/java/work/slhaf/agent/module/modules/memory/selector/extractor/MemorySelectExtractor.java rename to Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/selector/extractor/MemorySelectExtractor.java index e810b0ab..4945a314 100644 --- a/src/main/java/work/slhaf/agent/module/modules/memory/selector/extractor/MemorySelectExtractor.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/selector/extractor/MemorySelectExtractor.java @@ -1,32 +1,32 @@ -package work.slhaf.agent.module.modules.memory.selector.extractor; +package work.slhaf.partner.module.modules.memory.selector.extractor; import cn.hutool.json.JSONUtil; import com.alibaba.fastjson2.JSONObject; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.extern.slf4j.Slf4j; -import work.slhaf.agent.common.chat.pojo.Message; -import work.slhaf.agent.common.chat.pojo.MetaMessage; -import work.slhaf.agent.common.exception_handler.GlobalExceptionHandler; -import work.slhaf.agent.common.exception_handler.pojo.GlobalException; -import work.slhaf.agent.core.cognation.capability.ability.CognationCapability; -import work.slhaf.agent.core.cognation.CognationManager; -import work.slhaf.agent.core.cognation.capability.ability.MemoryCapability; -import work.slhaf.agent.core.interaction.data.context.InteractionContext; -import work.slhaf.agent.core.session.SessionManager; -import work.slhaf.agent.module.common.Model; -import work.slhaf.agent.module.common.ModelConstant; -import work.slhaf.agent.module.modules.memory.selector.extractor.data.ExtractorInput; -import work.slhaf.agent.module.modules.memory.selector.extractor.data.ExtractorMatchData; -import work.slhaf.agent.module.modules.memory.selector.extractor.data.ExtractorResult; -import work.slhaf.agent.core.cognation.submodule.memory.pojo.EvaluatedSlice; +import work.slhaf.partner.common.chat.pojo.Message; +import work.slhaf.partner.common.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.capability.ability.CognationCapability; +import work.slhaf.partner.core.cognation.CognationManager; +import work.slhaf.partner.core.cognation.capability.ability.MemoryCapability; +import work.slhaf.partner.core.interaction.data.context.InteractionContext; +import work.slhaf.partner.core.session.SessionManager; +import work.slhaf.partner.module.common.Model; +import work.slhaf.partner.module.common.ModelConstant; +import work.slhaf.partner.module.modules.memory.selector.extractor.data.ExtractorInput; +import work.slhaf.partner.module.modules.memory.selector.extractor.data.ExtractorMatchData; +import work.slhaf.partner.module.modules.memory.selector.extractor.data.ExtractorResult; +import work.slhaf.partner.core.cognation.submodule.memory.pojo.EvaluatedSlice; import java.io.IOException; import java.util.ArrayList; import java.util.List; -import static work.slhaf.agent.common.util.ExtractUtil.extractJson; -import static work.slhaf.agent.common.util.ExtractUtil.fixTopicPath; +import static work.slhaf.partner.common.util.ExtractUtil.extractJson; +import static work.slhaf.partner.common.util.ExtractUtil.fixTopicPath; @EqualsAndHashCode(callSuper = true) @Data diff --git a/src/main/java/work/slhaf/agent/module/modules/memory/selector/extractor/data/ExtractorInput.java b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/selector/extractor/data/ExtractorInput.java similarity index 60% rename from src/main/java/work/slhaf/agent/module/modules/memory/selector/extractor/data/ExtractorInput.java rename to Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/selector/extractor/data/ExtractorInput.java index 36adc323..2bc631c6 100644 --- a/src/main/java/work/slhaf/agent/module/modules/memory/selector/extractor/data/ExtractorInput.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/selector/extractor/data/ExtractorInput.java @@ -1,9 +1,9 @@ -package work.slhaf.agent.module.modules.memory.selector.extractor.data; +package work.slhaf.partner.module.modules.memory.selector.extractor.data; import lombok.Builder; import lombok.Data; -import work.slhaf.agent.common.chat.pojo.Message; -import work.slhaf.agent.core.cognation.submodule.memory.pojo.EvaluatedSlice; +import work.slhaf.partner.common.chat.pojo.Message; +import work.slhaf.partner.core.cognation.submodule.memory.pojo.EvaluatedSlice; import java.time.LocalDate; import java.util.List; diff --git a/src/main/java/work/slhaf/agent/module/modules/memory/selector/extractor/data/ExtractorMatchData.java b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/selector/extractor/data/ExtractorMatchData.java similarity index 77% rename from src/main/java/work/slhaf/agent/module/modules/memory/selector/extractor/data/ExtractorMatchData.java rename to Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/selector/extractor/data/ExtractorMatchData.java index 86d33097..26079403 100644 --- a/src/main/java/work/slhaf/agent/module/modules/memory/selector/extractor/data/ExtractorMatchData.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/selector/extractor/data/ExtractorMatchData.java @@ -1,4 +1,4 @@ -package work.slhaf.agent.module.modules.memory.selector.extractor.data; +package work.slhaf.partner.module.modules.memory.selector.extractor.data; import lombok.Data; diff --git a/src/main/java/work/slhaf/agent/module/modules/memory/selector/extractor/data/ExtractorResult.java b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/selector/extractor/data/ExtractorResult.java similarity index 68% rename from src/main/java/work/slhaf/agent/module/modules/memory/selector/extractor/data/ExtractorResult.java rename to Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/selector/extractor/data/ExtractorResult.java index 0a69fa07..50fba424 100644 --- a/src/main/java/work/slhaf/agent/module/modules/memory/selector/extractor/data/ExtractorResult.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/selector/extractor/data/ExtractorResult.java @@ -1,4 +1,4 @@ -package work.slhaf.agent.module.modules.memory.selector.extractor.data; +package work.slhaf.partner.module.modules.memory.selector.extractor.data; import lombok.Data; diff --git a/src/main/java/work/slhaf/agent/module/modules/memory/updater/MemoryUpdater.java b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/updater/MemoryUpdater.java similarity index 90% rename from src/main/java/work/slhaf/agent/module/modules/memory/updater/MemoryUpdater.java rename to Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/updater/MemoryUpdater.java index 35bf6b09..2295d5e2 100644 --- a/src/main/java/work/slhaf/agent/module/modules/memory/updater/MemoryUpdater.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/updater/MemoryUpdater.java @@ -1,24 +1,24 @@ -package work.slhaf.agent.module.modules.memory.updater; +package work.slhaf.partner.module.modules.memory.updater; import com.alibaba.fastjson2.JSONObject; import lombok.Data; import lombok.extern.slf4j.Slf4j; -import work.slhaf.agent.common.chat.constant.ChatConstant; -import work.slhaf.agent.common.chat.pojo.Message; -import work.slhaf.agent.common.thread.InteractionThreadPoolExecutor; -import work.slhaf.agent.core.cognation.capability.ability.CognationCapability; -import work.slhaf.agent.core.cognation.CognationManager; -import work.slhaf.agent.core.cognation.capability.ability.CacheCapability; -import work.slhaf.agent.core.cognation.capability.ability.MemoryCapability; -import work.slhaf.agent.core.cognation.submodule.memory.pojo.MemorySlice; -import work.slhaf.agent.core.cognation.capability.ability.PerceiveCapability; -import work.slhaf.agent.core.interaction.data.context.InteractionContext; -import work.slhaf.agent.core.interaction.module.InteractionModule; -import work.slhaf.agent.core.session.SessionManager; -import work.slhaf.agent.module.modules.memory.selector.extractor.MemorySelectExtractor; -import work.slhaf.agent.module.modules.memory.updater.summarizer.MemorySummarizer; -import work.slhaf.agent.module.modules.memory.updater.summarizer.data.SummarizeInput; -import work.slhaf.agent.module.modules.memory.updater.summarizer.data.SummarizeResult; +import work.slhaf.partner.common.chat.constant.ChatConstant; +import work.slhaf.partner.common.chat.pojo.Message; +import work.slhaf.partner.common.thread.InteractionThreadPoolExecutor; +import work.slhaf.partner.core.cognation.capability.ability.CognationCapability; +import work.slhaf.partner.core.cognation.CognationManager; +import work.slhaf.partner.core.cognation.capability.ability.CacheCapability; +import work.slhaf.partner.core.cognation.capability.ability.MemoryCapability; +import work.slhaf.partner.core.cognation.submodule.memory.pojo.MemorySlice; +import work.slhaf.partner.core.cognation.capability.ability.PerceiveCapability; +import work.slhaf.partner.core.interaction.data.context.InteractionContext; +import work.slhaf.partner.core.interaction.module.InteractionModule; +import work.slhaf.partner.core.session.SessionManager; +import work.slhaf.partner.module.modules.memory.selector.extractor.MemorySelectExtractor; +import work.slhaf.partner.module.modules.memory.updater.summarizer.MemorySummarizer; +import work.slhaf.partner.module.modules.memory.updater.summarizer.data.SummarizeInput; +import work.slhaf.partner.module.modules.memory.updater.summarizer.data.SummarizeResult; import java.io.IOException; import java.time.LocalDateTime; @@ -26,7 +26,7 @@ import java.util.*; import java.util.concurrent.Callable; import java.util.concurrent.atomic.AtomicInteger; -import static work.slhaf.agent.common.util.ExtractUtil.extractUserId; +import static work.slhaf.partner.common.util.ExtractUtil.extractUserId; @Data @Slf4j diff --git a/src/main/java/work/slhaf/agent/module/modules/memory/updater/exception/UnExpectedMessageCountException.java b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/updater/exception/UnExpectedMessageCountException.java similarity index 70% rename from src/main/java/work/slhaf/agent/module/modules/memory/updater/exception/UnExpectedMessageCountException.java rename to Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/updater/exception/UnExpectedMessageCountException.java index c793238a..bc560382 100644 --- a/src/main/java/work/slhaf/agent/module/modules/memory/updater/exception/UnExpectedMessageCountException.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/updater/exception/UnExpectedMessageCountException.java @@ -1,4 +1,4 @@ -package work.slhaf.agent.module.modules.memory.updater.exception; +package work.slhaf.partner.module.modules.memory.updater.exception; public class UnExpectedMessageCountException extends RuntimeException { public UnExpectedMessageCountException(String message) { diff --git a/src/main/java/work/slhaf/agent/module/modules/memory/updater/summarizer/MemorySummarizer.java b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/updater/summarizer/MemorySummarizer.java similarity index 83% rename from src/main/java/work/slhaf/agent/module/modules/memory/updater/summarizer/MemorySummarizer.java rename to Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/updater/summarizer/MemorySummarizer.java index f0f413e4..ede8e5c4 100644 --- a/src/main/java/work/slhaf/agent/module/modules/memory/updater/summarizer/MemorySummarizer.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/updater/summarizer/MemorySummarizer.java @@ -1,10 +1,10 @@ -package work.slhaf.agent.module.modules.memory.updater.summarizer; +package work.slhaf.partner.module.modules.memory.updater.summarizer; import lombok.Data; import lombok.extern.slf4j.Slf4j; -import work.slhaf.agent.common.thread.InteractionThreadPoolExecutor; -import work.slhaf.agent.module.modules.memory.updater.summarizer.data.SummarizeInput; -import work.slhaf.agent.module.modules.memory.updater.summarizer.data.SummarizeResult; +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; import java.util.HashMap; diff --git a/src/main/java/work/slhaf/agent/module/modules/memory/updater/summarizer/MultiSummarizer.java b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/updater/summarizer/MultiSummarizer.java similarity index 78% rename from src/main/java/work/slhaf/agent/module/modules/memory/updater/summarizer/MultiSummarizer.java rename to Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/updater/summarizer/MultiSummarizer.java index afe0cf07..83edd519 100644 --- a/src/main/java/work/slhaf/agent/module/modules/memory/updater/summarizer/MultiSummarizer.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/updater/summarizer/MultiSummarizer.java @@ -1,21 +1,21 @@ -package work.slhaf.agent.module.modules.memory.updater.summarizer; +package work.slhaf.partner.module.modules.memory.updater.summarizer; import cn.hutool.json.JSONUtil; import com.alibaba.fastjson2.JSONObject; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.extern.slf4j.Slf4j; -import work.slhaf.agent.common.chat.pojo.ChatResponse; -import work.slhaf.agent.module.common.Model; -import work.slhaf.agent.module.common.ModelConstant; -import work.slhaf.agent.module.modules.memory.updater.summarizer.data.SummarizeInput; -import work.slhaf.agent.module.modules.memory.updater.summarizer.data.SummarizeResult; +import work.slhaf.partner.common.chat.pojo.ChatResponse; +import work.slhaf.partner.module.common.Model; +import work.slhaf.partner.module.common.ModelConstant; +import work.slhaf.partner.module.modules.memory.updater.summarizer.data.SummarizeInput; +import work.slhaf.partner.module.modules.memory.updater.summarizer.data.SummarizeResult; import java.util.ArrayList; import java.util.List; -import static work.slhaf.agent.common.util.ExtractUtil.extractJson; -import static work.slhaf.agent.common.util.ExtractUtil.fixTopicPath; +import static work.slhaf.partner.common.util.ExtractUtil.extractJson; +import static work.slhaf.partner.common.util.ExtractUtil.fixTopicPath; @EqualsAndHashCode(callSuper = true) @Data diff --git a/src/main/java/work/slhaf/agent/module/modules/memory/updater/summarizer/SingleSummarizer.java b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/updater/summarizer/SingleSummarizer.java similarity index 86% rename from src/main/java/work/slhaf/agent/module/modules/memory/updater/summarizer/SingleSummarizer.java rename to Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/updater/summarizer/SingleSummarizer.java index 8535b73e..c08e31c2 100644 --- a/src/main/java/work/slhaf/agent/module/modules/memory/updater/summarizer/SingleSummarizer.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/updater/summarizer/SingleSummarizer.java @@ -1,15 +1,15 @@ -package work.slhaf.agent.module.modules.memory.updater.summarizer; +package work.slhaf.partner.module.modules.memory.updater.summarizer; import com.alibaba.fastjson2.JSONObject; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.extern.slf4j.Slf4j; -import work.slhaf.agent.common.chat.constant.ChatConstant; -import work.slhaf.agent.common.chat.pojo.ChatResponse; -import work.slhaf.agent.common.chat.pojo.Message; -import work.slhaf.agent.common.thread.InteractionThreadPoolExecutor; -import work.slhaf.agent.module.common.Model; -import work.slhaf.agent.module.common.ModelConstant; +import work.slhaf.partner.common.chat.constant.ChatConstant; +import work.slhaf.partner.common.chat.pojo.ChatResponse; +import work.slhaf.partner.common.chat.pojo.Message; +import work.slhaf.partner.common.thread.InteractionThreadPoolExecutor; +import work.slhaf.partner.module.common.Model; +import work.slhaf.partner.module.common.ModelConstant; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/work/slhaf/agent/module/modules/memory/updater/summarizer/TotalSummarizer.java b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/updater/summarizer/TotalSummarizer.java similarity index 79% rename from src/main/java/work/slhaf/agent/module/modules/memory/updater/summarizer/TotalSummarizer.java rename to Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/updater/summarizer/TotalSummarizer.java index fd9ed47b..264bc036 100644 --- a/src/main/java/work/slhaf/agent/module/modules/memory/updater/summarizer/TotalSummarizer.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/updater/summarizer/TotalSummarizer.java @@ -1,17 +1,17 @@ -package work.slhaf.agent.module.modules.memory.updater.summarizer; +package work.slhaf.partner.module.modules.memory.updater.summarizer; import cn.hutool.json.JSONUtil; import com.alibaba.fastjson2.JSONObject; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.extern.slf4j.Slf4j; -import work.slhaf.agent.common.chat.pojo.ChatResponse; -import work.slhaf.agent.module.common.Model; -import work.slhaf.agent.module.common.ModelConstant; +import work.slhaf.partner.common.chat.pojo.ChatResponse; +import work.slhaf.partner.module.common.Model; +import work.slhaf.partner.module.common.ModelConstant; import java.util.HashMap; -import static work.slhaf.agent.common.util.ExtractUtil.extractJson; +import static work.slhaf.partner.common.util.ExtractUtil.extractJson; @EqualsAndHashCode(callSuper = true) @Data diff --git a/src/main/java/work/slhaf/agent/module/modules/memory/updater/summarizer/data/SummarizeInput.java b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/updater/summarizer/data/SummarizeInput.java similarity index 62% rename from src/main/java/work/slhaf/agent/module/modules/memory/updater/summarizer/data/SummarizeInput.java rename to Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/updater/summarizer/data/SummarizeInput.java index e66bfc59..ccd99291 100644 --- a/src/main/java/work/slhaf/agent/module/modules/memory/updater/summarizer/data/SummarizeInput.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/updater/summarizer/data/SummarizeInput.java @@ -1,8 +1,8 @@ -package work.slhaf.agent.module.modules.memory.updater.summarizer.data; +package work.slhaf.partner.module.modules.memory.updater.summarizer.data; import lombok.AllArgsConstructor; import lombok.Data; -import work.slhaf.agent.common.chat.pojo.Message; +import work.slhaf.partner.common.chat.pojo.Message; import java.util.List; diff --git a/src/main/java/work/slhaf/agent/module/modules/memory/updater/summarizer/data/SummarizeResult.java b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/updater/summarizer/data/SummarizeResult.java similarity index 74% rename from src/main/java/work/slhaf/agent/module/modules/memory/updater/summarizer/data/SummarizeResult.java rename to Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/updater/summarizer/data/SummarizeResult.java index a1fc7292..f3eae4db 100644 --- a/src/main/java/work/slhaf/agent/module/modules/memory/updater/summarizer/data/SummarizeResult.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/memory/updater/summarizer/data/SummarizeResult.java @@ -1,4 +1,4 @@ -package work.slhaf.agent.module.modules.memory.updater.summarizer.data; +package work.slhaf.partner.module.modules.memory.updater.summarizer.data; import lombok.Data; diff --git a/src/main/java/work/slhaf/agent/module/modules/perceive/selector/PerceiveSelector.java b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/perceive/selector/PerceiveSelector.java similarity index 83% rename from src/main/java/work/slhaf/agent/module/modules/perceive/selector/PerceiveSelector.java rename to Partner-Core/src/main/java/work/slhaf/partner/module/modules/perceive/selector/PerceiveSelector.java index 0c672427..eddfaf35 100644 --- a/src/main/java/work/slhaf/agent/module/modules/perceive/selector/PerceiveSelector.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/perceive/selector/PerceiveSelector.java @@ -1,12 +1,12 @@ -package work.slhaf.agent.module.modules.perceive.selector; +package work.slhaf.partner.module.modules.perceive.selector; import lombok.Setter; import lombok.extern.slf4j.Slf4j; -import work.slhaf.agent.core.cognation.CognationManager; -import work.slhaf.agent.core.cognation.capability.ability.PerceiveCapability; -import work.slhaf.agent.core.cognation.submodule.perceive.pojo.User; -import work.slhaf.agent.core.interaction.data.context.InteractionContext; -import work.slhaf.agent.module.common.PreModule; +import work.slhaf.partner.core.cognation.CognationManager; +import work.slhaf.partner.core.cognation.capability.ability.PerceiveCapability; +import work.slhaf.partner.core.cognation.submodule.perceive.pojo.User; +import work.slhaf.partner.core.interaction.data.context.InteractionContext; +import work.slhaf.partner.module.common.PreModule; import java.io.IOException; import java.util.HashMap; diff --git a/src/main/java/work/slhaf/agent/module/modules/perceive/updater/PerceiveUpdater.java b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/perceive/updater/PerceiveUpdater.java similarity index 78% rename from src/main/java/work/slhaf/agent/module/modules/perceive/updater/PerceiveUpdater.java rename to Partner-Core/src/main/java/work/slhaf/partner/module/modules/perceive/updater/PerceiveUpdater.java index 958ade73..3e09ab91 100644 --- a/src/main/java/work/slhaf/agent/module/modules/perceive/updater/PerceiveUpdater.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/perceive/updater/PerceiveUpdater.java @@ -1,20 +1,20 @@ -package work.slhaf.agent.module.modules.perceive.updater; +package work.slhaf.partner.module.modules.perceive.updater; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.extern.slf4j.Slf4j; -import work.slhaf.agent.common.thread.InteractionThreadPoolExecutor; -import work.slhaf.agent.core.cognation.capability.ability.CognationCapability; -import work.slhaf.agent.core.cognation.CognationManager; -import work.slhaf.agent.core.cognation.capability.ability.PerceiveCapability; -import work.slhaf.agent.core.cognation.submodule.perceive.pojo.User; -import work.slhaf.agent.core.interaction.data.context.InteractionContext; -import work.slhaf.agent.core.interaction.module.InteractionModule; -import work.slhaf.agent.module.common.Model; -import work.slhaf.agent.module.common.ModelConstant; -import work.slhaf.agent.module.modules.perceive.updater.relation_extractor.pojo.RelationExtractResult; -import work.slhaf.agent.module.modules.perceive.updater.relation_extractor.RelationExtractor; -import work.slhaf.agent.module.modules.perceive.updater.static_extractor.StaticMemoryExtractor; +import work.slhaf.partner.common.thread.InteractionThreadPoolExecutor; +import work.slhaf.partner.core.cognation.capability.ability.CognationCapability; +import work.slhaf.partner.core.cognation.CognationManager; +import work.slhaf.partner.core.cognation.capability.ability.PerceiveCapability; +import work.slhaf.partner.core.cognation.submodule.perceive.pojo.User; +import work.slhaf.partner.core.interaction.data.context.InteractionContext; +import work.slhaf.partner.core.interaction.module.InteractionModule; +import work.slhaf.partner.module.common.Model; +import work.slhaf.partner.module.common.ModelConstant; +import work.slhaf.partner.module.modules.perceive.updater.relation_extractor.pojo.RelationExtractResult; +import work.slhaf.partner.module.modules.perceive.updater.relation_extractor.RelationExtractor; +import work.slhaf.partner.module.modules.perceive.updater.static_extractor.StaticMemoryExtractor; import java.io.IOException; import java.util.*; diff --git a/src/main/java/work/slhaf/agent/module/modules/perceive/updater/relation_extractor/RelationExtractor.java b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/perceive/updater/relation_extractor/RelationExtractor.java similarity index 78% rename from src/main/java/work/slhaf/agent/module/modules/perceive/updater/relation_extractor/RelationExtractor.java rename to Partner-Core/src/main/java/work/slhaf/partner/module/modules/perceive/updater/relation_extractor/RelationExtractor.java index 8325551e..a0505a79 100644 --- a/src/main/java/work/slhaf/agent/module/modules/perceive/updater/relation_extractor/RelationExtractor.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/perceive/updater/relation_extractor/RelationExtractor.java @@ -1,18 +1,18 @@ -package work.slhaf.agent.module.modules.perceive.updater.relation_extractor; +package work.slhaf.partner.module.modules.perceive.updater.relation_extractor; import com.alibaba.fastjson2.JSONObject; import lombok.Data; -import work.slhaf.agent.common.chat.pojo.ChatResponse; -import work.slhaf.agent.common.chat.pojo.Message; -import work.slhaf.agent.core.cognation.capability.ability.CognationCapability; -import work.slhaf.agent.core.cognation.CognationManager; -import work.slhaf.agent.core.cognation.capability.ability.PerceiveCapability; -import work.slhaf.agent.core.cognation.submodule.perceive.pojo.User; -import work.slhaf.agent.core.interaction.data.context.InteractionContext; -import work.slhaf.agent.module.common.Model; -import work.slhaf.agent.module.common.ModelConstant; -import work.slhaf.agent.module.modules.perceive.updater.relation_extractor.pojo.RelationExtractInput; -import work.slhaf.agent.module.modules.perceive.updater.relation_extractor.pojo.RelationExtractResult; +import work.slhaf.partner.common.chat.pojo.ChatResponse; +import work.slhaf.partner.common.chat.pojo.Message; +import work.slhaf.partner.core.cognation.capability.ability.CognationCapability; +import work.slhaf.partner.core.cognation.CognationManager; +import work.slhaf.partner.core.cognation.capability.ability.PerceiveCapability; +import work.slhaf.partner.core.cognation.submodule.perceive.pojo.User; +import work.slhaf.partner.core.interaction.data.context.InteractionContext; +import work.slhaf.partner.module.common.Model; +import work.slhaf.partner.module.common.ModelConstant; +import work.slhaf.partner.module.modules.perceive.updater.relation_extractor.pojo.RelationExtractInput; +import work.slhaf.partner.module.modules.perceive.updater.relation_extractor.pojo.RelationExtractResult; import java.io.IOException; import java.util.ArrayList; diff --git a/src/main/java/work/slhaf/agent/module/modules/perceive/updater/relation_extractor/pojo/RelationExtractInput.java b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/perceive/updater/relation_extractor/pojo/RelationExtractInput.java similarity index 60% rename from src/main/java/work/slhaf/agent/module/modules/perceive/updater/relation_extractor/pojo/RelationExtractInput.java rename to Partner-Core/src/main/java/work/slhaf/partner/module/modules/perceive/updater/relation_extractor/pojo/RelationExtractInput.java index 184e86b9..c562b2bc 100644 --- a/src/main/java/work/slhaf/agent/module/modules/perceive/updater/relation_extractor/pojo/RelationExtractInput.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/perceive/updater/relation_extractor/pojo/RelationExtractInput.java @@ -1,7 +1,7 @@ -package work.slhaf.agent.module.modules.perceive.updater.relation_extractor.pojo; +package work.slhaf.partner.module.modules.perceive.updater.relation_extractor.pojo; import lombok.Data; -import work.slhaf.agent.common.chat.pojo.Message; +import work.slhaf.partner.common.chat.pojo.Message; import java.util.HashMap; import java.util.List; diff --git a/src/main/java/work/slhaf/agent/module/modules/perceive/updater/relation_extractor/pojo/RelationExtractResult.java b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/perceive/updater/relation_extractor/pojo/RelationExtractResult.java similarity index 73% rename from src/main/java/work/slhaf/agent/module/modules/perceive/updater/relation_extractor/pojo/RelationExtractResult.java rename to Partner-Core/src/main/java/work/slhaf/partner/module/modules/perceive/updater/relation_extractor/pojo/RelationExtractResult.java index 2d7b3d08..e25695dc 100644 --- a/src/main/java/work/slhaf/agent/module/modules/perceive/updater/relation_extractor/pojo/RelationExtractResult.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/perceive/updater/relation_extractor/pojo/RelationExtractResult.java @@ -1,4 +1,4 @@ -package work.slhaf.agent.module.modules.perceive.updater.relation_extractor.pojo; +package work.slhaf.partner.module.modules.perceive.updater.relation_extractor.pojo; import lombok.Data; diff --git a/src/main/java/work/slhaf/agent/module/modules/perceive/updater/static_extractor/StaticMemoryExtractor.java b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/perceive/updater/static_extractor/StaticMemoryExtractor.java similarity index 75% rename from src/main/java/work/slhaf/agent/module/modules/perceive/updater/static_extractor/StaticMemoryExtractor.java rename to Partner-Core/src/main/java/work/slhaf/partner/module/modules/perceive/updater/static_extractor/StaticMemoryExtractor.java index e714ed69..76a7bb5b 100644 --- a/src/main/java/work/slhaf/agent/module/modules/perceive/updater/static_extractor/StaticMemoryExtractor.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/perceive/updater/static_extractor/StaticMemoryExtractor.java @@ -1,17 +1,17 @@ -package work.slhaf.agent.module.modules.perceive.updater.static_extractor; +package work.slhaf.partner.module.modules.perceive.updater.static_extractor; import cn.hutool.json.JSONUtil; import com.alibaba.fastjson2.JSONObject; import lombok.Data; import lombok.EqualsAndHashCode; -import work.slhaf.agent.common.chat.pojo.ChatResponse; -import work.slhaf.agent.core.cognation.capability.ability.CognationCapability; -import work.slhaf.agent.core.cognation.CognationManager; -import work.slhaf.agent.core.cognation.capability.ability.PerceiveCapability; -import work.slhaf.agent.core.interaction.data.context.InteractionContext; -import work.slhaf.agent.module.common.Model; -import work.slhaf.agent.module.common.ModelConstant; -import work.slhaf.agent.module.modules.perceive.updater.static_extractor.data.StaticMemoryExtractInput; +import work.slhaf.partner.common.chat.pojo.ChatResponse; +import work.slhaf.partner.core.cognation.capability.ability.CognationCapability; +import work.slhaf.partner.core.cognation.CognationManager; +import work.slhaf.partner.core.cognation.capability.ability.PerceiveCapability; +import work.slhaf.partner.core.interaction.data.context.InteractionContext; +import work.slhaf.partner.module.common.Model; +import work.slhaf.partner.module.common.ModelConstant; +import work.slhaf.partner.module.modules.perceive.updater.static_extractor.data.StaticMemoryExtractInput; import java.io.IOException; import java.util.HashMap; diff --git a/src/main/java/work/slhaf/agent/module/modules/perceive/updater/static_extractor/data/StaticMemoryExtractInput.java b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/perceive/updater/static_extractor/data/StaticMemoryExtractInput.java similarity index 65% rename from src/main/java/work/slhaf/agent/module/modules/perceive/updater/static_extractor/data/StaticMemoryExtractInput.java rename to Partner-Core/src/main/java/work/slhaf/partner/module/modules/perceive/updater/static_extractor/data/StaticMemoryExtractInput.java index 364554d6..e32ea576 100644 --- a/src/main/java/work/slhaf/agent/module/modules/perceive/updater/static_extractor/data/StaticMemoryExtractInput.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/perceive/updater/static_extractor/data/StaticMemoryExtractInput.java @@ -1,8 +1,8 @@ -package work.slhaf.agent.module.modules.perceive.updater.static_extractor.data; +package work.slhaf.partner.module.modules.perceive.updater.static_extractor.data; import lombok.Builder; import lombok.Data; -import work.slhaf.agent.common.chat.pojo.Message; +import work.slhaf.partner.common.chat.pojo.Message; import java.util.List; import java.util.Map; diff --git a/src/main/java/work/slhaf/agent/module/modules/process/PostprocessExecutor.java b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/process/PostprocessExecutor.java similarity index 78% rename from src/main/java/work/slhaf/agent/module/modules/process/PostprocessExecutor.java rename to Partner-Core/src/main/java/work/slhaf/partner/module/modules/process/PostprocessExecutor.java index abf7f291..84c1a5c4 100644 --- a/src/main/java/work/slhaf/agent/module/modules/process/PostprocessExecutor.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/process/PostprocessExecutor.java @@ -1,11 +1,11 @@ -package work.slhaf.agent.module.modules.process; +package work.slhaf.partner.module.modules.process; import lombok.Data; import lombok.extern.slf4j.Slf4j; -import work.slhaf.agent.core.cognation.capability.ability.CognationCapability; -import work.slhaf.agent.core.cognation.CognationManager; -import work.slhaf.agent.core.interaction.data.context.InteractionContext; -import work.slhaf.agent.core.interaction.module.InteractionModule; +import work.slhaf.partner.core.cognation.capability.ability.CognationCapability; +import work.slhaf.partner.core.cognation.CognationManager; +import work.slhaf.partner.core.interaction.data.context.InteractionContext; +import work.slhaf.partner.core.interaction.module.InteractionModule; import java.io.IOException; diff --git a/src/main/java/work/slhaf/agent/module/modules/process/PreprocessExecutor.java b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/process/PreprocessExecutor.java similarity index 87% rename from src/main/java/work/slhaf/agent/module/modules/process/PreprocessExecutor.java rename to Partner-Core/src/main/java/work/slhaf/partner/module/modules/process/PreprocessExecutor.java index cf042ae5..e489029f 100644 --- a/src/main/java/work/slhaf/agent/module/modules/process/PreprocessExecutor.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/process/PreprocessExecutor.java @@ -1,15 +1,15 @@ -package work.slhaf.agent.module.modules.process; +package work.slhaf.partner.module.modules.process; import lombok.Data; import lombok.extern.slf4j.Slf4j; -import work.slhaf.agent.core.cognation.capability.ability.CognationCapability; -import work.slhaf.agent.core.cognation.CognationManager; -import work.slhaf.agent.core.cognation.capability.ability.PerceiveCapability; -import work.slhaf.agent.core.cognation.submodule.perceive.pojo.User; -import work.slhaf.agent.core.interaction.data.InteractionInputData; -import work.slhaf.agent.core.interaction.data.context.InteractionContext; -import work.slhaf.agent.core.session.SessionManager; -import work.slhaf.agent.module.common.AppendPromptData; +import work.slhaf.partner.core.cognation.capability.ability.CognationCapability; +import work.slhaf.partner.core.cognation.CognationManager; +import work.slhaf.partner.core.cognation.capability.ability.PerceiveCapability; +import work.slhaf.partner.core.cognation.submodule.perceive.pojo.User; +import work.slhaf.partner.core.interaction.data.InteractionInputData; +import work.slhaf.partner.core.interaction.data.context.InteractionContext; +import work.slhaf.partner.core.session.SessionManager; +import work.slhaf.partner.module.common.AppendPromptData; import java.io.IOException; import java.time.LocalDateTime; diff --git a/src/main/java/work/slhaf/agent/module/modules/task/TaskEvaluator.java b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/task/TaskEvaluator.java similarity index 79% rename from src/main/java/work/slhaf/agent/module/modules/task/TaskEvaluator.java rename to Partner-Core/src/main/java/work/slhaf/partner/module/modules/task/TaskEvaluator.java index 087e0b47..061f157c 100644 --- a/src/main/java/work/slhaf/agent/module/modules/task/TaskEvaluator.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/task/TaskEvaluator.java @@ -1,9 +1,9 @@ -package work.slhaf.agent.module.modules.task; +package work.slhaf.partner.module.modules.task; import lombok.Data; import lombok.EqualsAndHashCode; -import work.slhaf.agent.module.common.Model; -import work.slhaf.agent.module.common.ModelConstant; +import work.slhaf.partner.module.common.Model; +import work.slhaf.partner.module.common.ModelConstant; @EqualsAndHashCode(callSuper = true) @Data diff --git a/src/main/java/work/slhaf/agent/module/modules/task/TaskExecutor.java b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/task/TaskExecutor.java similarity index 78% rename from src/main/java/work/slhaf/agent/module/modules/task/TaskExecutor.java rename to Partner-Core/src/main/java/work/slhaf/partner/module/modules/task/TaskExecutor.java index dd234017..2ba09776 100644 --- a/src/main/java/work/slhaf/agent/module/modules/task/TaskExecutor.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/task/TaskExecutor.java @@ -1,7 +1,7 @@ -package work.slhaf.agent.module.modules.task; +package work.slhaf.partner.module.modules.task; import lombok.Data; -import work.slhaf.agent.common.thread.InteractionThreadPoolExecutor; +import work.slhaf.partner.common.thread.InteractionThreadPoolExecutor; @Data public class TaskExecutor { diff --git a/src/main/java/work/slhaf/agent/module/modules/task/TaskScheduler.java b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/task/TaskScheduler.java similarity index 73% rename from src/main/java/work/slhaf/agent/module/modules/task/TaskScheduler.java rename to Partner-Core/src/main/java/work/slhaf/partner/module/modules/task/TaskScheduler.java index 0e6f4960..e9190a6a 100644 --- a/src/main/java/work/slhaf/agent/module/modules/task/TaskScheduler.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/task/TaskScheduler.java @@ -1,9 +1,9 @@ -package work.slhaf.agent.module.modules.task; +package work.slhaf.partner.module.modules.task; import lombok.Data; import lombok.extern.slf4j.Slf4j; -import work.slhaf.agent.core.interaction.data.context.InteractionContext; -import work.slhaf.agent.core.interaction.module.InteractionModule; +import work.slhaf.partner.core.interaction.data.context.InteractionContext; +import work.slhaf.partner.core.interaction.module.InteractionModule; @Data @Slf4j diff --git a/src/main/java/work/slhaf/agent/module/modules/task/data/TaskData.java b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/task/data/TaskData.java similarity index 91% rename from src/main/java/work/slhaf/agent/module/modules/task/data/TaskData.java rename to Partner-Core/src/main/java/work/slhaf/partner/module/modules/task/data/TaskData.java index 85272a97..ff24197f 100644 --- a/src/main/java/work/slhaf/agent/module/modules/task/data/TaskData.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/modules/task/data/TaskData.java @@ -1,4 +1,4 @@ -package work.slhaf.agent.module.modules.task.data; +package work.slhaf.partner.module.modules.task.data; import lombok.Data; diff --git a/src/main/resources/logback.xml b/Partner-Core/src/main/resources/logback.xml similarity index 100% rename from src/main/resources/logback.xml rename to Partner-Core/src/main/resources/logback.xml diff --git a/src/main/resources/modules/default_activated_model.json b/Partner-Core/src/main/resources/modules/default_activated_model.json similarity index 100% rename from src/main/resources/modules/default_activated_model.json rename to Partner-Core/src/main/resources/modules/default_activated_model.json diff --git a/src/main/resources/prompt/module/core/core_model.json b/Partner-Core/src/main/resources/prompt/module/core/core_model.json similarity index 100% rename from src/main/resources/prompt/module/core/core_model.json rename to Partner-Core/src/main/resources/prompt/module/core/core_model.json diff --git a/src/main/resources/prompt/module/memory/multi_summarizer.json b/Partner-Core/src/main/resources/prompt/module/memory/multi_summarizer.json similarity index 100% rename from src/main/resources/prompt/module/memory/multi_summarizer.json rename to Partner-Core/src/main/resources/prompt/module/memory/multi_summarizer.json diff --git a/src/main/resources/prompt/module/memory/single_summarizer.json b/Partner-Core/src/main/resources/prompt/module/memory/single_summarizer.json similarity index 100% rename from src/main/resources/prompt/module/memory/single_summarizer.json rename to Partner-Core/src/main/resources/prompt/module/memory/single_summarizer.json diff --git a/src/main/resources/prompt/module/memory/slice_evaluator.json b/Partner-Core/src/main/resources/prompt/module/memory/slice_evaluator.json similarity index 100% rename from src/main/resources/prompt/module/memory/slice_evaluator.json rename to Partner-Core/src/main/resources/prompt/module/memory/slice_evaluator.json diff --git a/src/main/resources/prompt/module/memory/topic_extractor.json b/Partner-Core/src/main/resources/prompt/module/memory/topic_extractor.json similarity index 100% rename from src/main/resources/prompt/module/memory/topic_extractor.json rename to Partner-Core/src/main/resources/prompt/module/memory/topic_extractor.json diff --git a/src/main/resources/prompt/module/memory/total_summarizer.json b/Partner-Core/src/main/resources/prompt/module/memory/total_summarizer.json similarity index 100% rename from src/main/resources/prompt/module/memory/total_summarizer.json rename to Partner-Core/src/main/resources/prompt/module/memory/total_summarizer.json diff --git a/src/main/resources/prompt/module/perceive/relation_extractor.json b/Partner-Core/src/main/resources/prompt/module/perceive/relation_extractor.json similarity index 100% rename from src/main/resources/prompt/module/perceive/relation_extractor.json rename to Partner-Core/src/main/resources/prompt/module/perceive/relation_extractor.json diff --git a/src/main/resources/prompt/module/perceive/static_extractor.json b/Partner-Core/src/main/resources/prompt/module/perceive/static_extractor.json similarity index 100% rename from src/main/resources/prompt/module/perceive/static_extractor.json rename to Partner-Core/src/main/resources/prompt/module/perceive/static_extractor.json diff --git a/src/main/resources/prompt/self_awareness.json b/Partner-Core/src/main/resources/prompt/self_awareness.json similarity index 100% rename from src/main/resources/prompt/self_awareness.json rename to Partner-Core/src/main/resources/prompt/self_awareness.json diff --git a/src/test/java/ReflectionTest.java b/Partner-Core/src/test/java/ReflectionTest.java similarity index 77% rename from src/test/java/ReflectionTest.java rename to Partner-Core/src/test/java/ReflectionTest.java index 4adc632f..8845bd9d 100644 --- a/src/test/java/ReflectionTest.java +++ b/Partner-Core/src/test/java/ReflectionTest.java @@ -1,7 +1,6 @@ import org.junit.jupiter.api.Test; -import work.slhaf.agent.core.cognation.capability.CapabilityRegister; -import work.slhaf.agent.core.cognation.capability.ability.MemoryCapability; -import work.slhaf.agent.core.cognation.common.pojo.MemoryResult; +import work.slhaf.partner.core.cognation.capability.ability.MemoryCapability; +import work.slhaf.partner.core.cognation.common.pojo.MemoryResult; import java.lang.reflect.Proxy; import java.util.function.Function; diff --git a/src/test/java/RegexTest.java b/Partner-Core/src/test/java/RegexTest.java similarity index 100% rename from src/test/java/RegexTest.java rename to Partner-Core/src/test/java/RegexTest.java diff --git a/src/test/java/SelfAwarenessTest.java b/Partner-Core/src/test/java/SelfAwarenessTest.java similarity index 91% rename from src/test/java/SelfAwarenessTest.java rename to Partner-Core/src/test/java/SelfAwarenessTest.java index 3ad2969f..61b2ff9e 100644 --- a/src/test/java/SelfAwarenessTest.java +++ b/Partner-Core/src/test/java/SelfAwarenessTest.java @@ -1,13 +1,13 @@ import cn.hutool.json.JSONUtil; import org.junit.jupiter.api.Test; -import work.slhaf.agent.common.chat.ChatClient; -import work.slhaf.agent.common.chat.constant.ChatConstant; -import work.slhaf.agent.common.chat.pojo.ChatResponse; -import work.slhaf.agent.common.chat.pojo.Message; -import work.slhaf.agent.common.config.ModelConfig; -import work.slhaf.agent.common.util.ResourcesUtil; -import work.slhaf.agent.module.common.ModelConstant; -import work.slhaf.agent.module.modules.memory.selector.extractor.data.ExtractorInput; +import work.slhaf.partner.common.chat.ChatClient; +import work.slhaf.partner.common.chat.constant.ChatConstant; +import work.slhaf.partner.common.chat.pojo.ChatResponse; +import work.slhaf.partner.common.chat.pojo.Message; +import work.slhaf.partner.common.config.ModelConfig; +import work.slhaf.partner.common.util.ResourcesUtil; +import work.slhaf.partner.module.common.ModelConstant; +import work.slhaf.partner.module.modules.memory.selector.extractor.data.ExtractorInput; import java.time.LocalDate; import java.util.ArrayList; diff --git a/src/test/java/ThreadPoolTest.java b/Partner-Core/src/test/java/ThreadPoolTest.java similarity index 100% rename from src/test/java/ThreadPoolTest.java rename to Partner-Core/src/test/java/ThreadPoolTest.java diff --git a/src/test/java/text/relation_input_test.json b/Partner-Core/src/test/java/text/relation_input_test.json similarity index 100% rename from src/test/java/text/relation_input_test.json rename to Partner-Core/src/test/java/text/relation_input_test.json diff --git a/src/test/java/text/relation_output_test.json b/Partner-Core/src/test/java/text/relation_output_test.json similarity index 100% rename from src/test/java/text/relation_output_test.json rename to Partner-Core/src/test/java/text/relation_output_test.json diff --git a/pom.xml b/pom.xml index facc723f..1f06916b 100644 --- a/pom.xml +++ b/pom.xml @@ -7,6 +7,11 @@ work.slhaf Partner 0.5.0 + pom + + Partner-Capability-Demo + Partner-Core + 21 diff --git a/src/main/java/work/slhaf/agent/core/cognation/NewCognationManager.java b/src/main/java/work/slhaf/agent/core/cognation/NewCognationManager.java deleted file mode 100644 index 802772cb..00000000 --- a/src/main/java/work/slhaf/agent/core/cognation/NewCognationManager.java +++ /dev/null @@ -1,5 +0,0 @@ -package work.slhaf.agent.core.cognation; - -public class NewCognationManager { - -} diff --git a/src/main/java/work/slhaf/agent/core/cognation/capability/CapabilityRegister.java b/src/main/java/work/slhaf/agent/core/cognation/capability/CapabilityRegister.java deleted file mode 100644 index 6b7ecf2a..00000000 --- a/src/main/java/work/slhaf/agent/core/cognation/capability/CapabilityRegister.java +++ /dev/null @@ -1,67 +0,0 @@ -package work.slhaf.agent.core.cognation.capability; - -import org.reflections.Reflections; -import work.slhaf.agent.core.cognation.capability.exception.CapabilityRegisterFailedException; -import work.slhaf.agent.core.cognation.capability.interfaces.Capability; -import work.slhaf.agent.core.cognation.capability.interfaces.CapabilityCore; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; -import java.util.Set; - -public class CapabilityRegister { - - public static volatile CapabilityRegister capabilityRegister; - - private CapabilityRegister(){ - } - - public static CapabilityRegister getInstance(){ - if (capabilityRegister == null) { - synchronized (CapabilityRegister.class) { - if (capabilityRegister == null) { - capabilityRegister = new CapabilityRegister(); - } - } - } - return capabilityRegister; - } - - public void registerCapabilities(){ - //检查可注册能力是否正常 - statusCheck(); - //扫描现有Capability, value为键，返回函数路由表 - } - - private void statusCheck(){ - Reflections reflections = new Reflections("work.slhaf.agent.core"); - Set> cores = reflections.getTypesAnnotatedWith(CapabilityCore.class); - Set> capabilities = reflections.getTypesAnnotatedWith(Capability.class); - if (cores.size() != capabilities.size()){ - throw new CapabilityRegisterFailedException("Capability 注册异常: 已存在的CapabilityCore与Capability数量不匹配!"); - } - if (checkValuesMatched(cores,capabilities)){ - throw new CapabilityRegisterFailedException("Capability 注册异常: 已存在的CapabilityCore与Capability不匹配!"); - } - } - - - private static boolean checkValuesMatched(Set> cores, Set> capabilities) { - List coresValues = new ArrayList<>(); - List capabilitiesValues = new ArrayList<>(); - for (Class core : cores) { - CapabilityCore annotation = core.getAnnotation(CapabilityCore.class); - if (annotation != null) { - coresValues.add(annotation.value()); - } - } - for (Class capability : capabilities) { - Capability annotation = capability.getAnnotation(Capability.class); - if (annotation != null) { - capabilitiesValues.add(annotation.value()); - } - } - return coresValues.equals(capabilitiesValues); - } -} diff --git a/src/main/java/work/slhaf/agent/core/cognation/capability/ability/DispatchCapability.java b/src/main/java/work/slhaf/agent/core/cognation/capability/ability/DispatchCapability.java deleted file mode 100644 index a4249709..00000000 --- a/src/main/java/work/slhaf/agent/core/cognation/capability/ability/DispatchCapability.java +++ /dev/null @@ -1,4 +0,0 @@ -package work.slhaf.agent.core.cognation.capability.ability; - -public interface DispatchCapability { -} diff --git a/src/main/java/work/slhaf/agent/core/cognation/capability/interfaces/InjectCapability.java b/src/main/java/work/slhaf/agent/core/cognation/capability/interfaces/InjectCapability.java deleted file mode 100644 index 706a9594..00000000 --- a/src/main/java/work/slhaf/agent/core/cognation/capability/interfaces/InjectCapability.java +++ /dev/null @@ -1,9 +0,0 @@ -package work.slhaf.agent.core.cognation.capability.interfaces; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Target; - -@Target(ElementType.FIELD) -public @interface InjectCapability { - String value(); -} diff --git a/src/main/java/work/slhaf/agent/gateway/MessageSender.java b/src/main/java/work/slhaf/agent/gateway/MessageSender.java deleted file mode 100644 index f0079582..00000000 --- a/src/main/java/work/slhaf/agent/gateway/MessageSender.java +++ /dev/null @@ -1,7 +0,0 @@ -package work.slhaf.agent.gateway; - -import work.slhaf.agent.core.interaction.data.InteractionOutputData; - -public interface MessageSender { - void sendMessage(InteractionOutputData outputData); -}