diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/action/executor/ActionExecutor.java b/Partner-Core/src/main/java/work/slhaf/partner/module/action/executor/ActionExecutor.java index 74768e86..d0ca8697 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/action/executor/ActionExecutor.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/action/executor/ActionExecutor.java @@ -1,5 +1,6 @@ package work.slhaf.partner.module.action.executor; +import lombok.extern.slf4j.Slf4j; import lombok.val; import org.jetbrains.annotations.NotNull; import work.slhaf.partner.core.action.ActionCapability; @@ -23,6 +24,7 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicReference; import java.util.stream.Collectors; +@Slf4j public class ActionExecutor extends AbstractAgentModule.Standalone { private static final int MAX_EXTRACTOR_ATTEMPTS = 3; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/action/planner/ActionPlanner.java b/Partner-Core/src/main/java/work/slhaf/partner/module/action/planner/ActionPlanner.java index 25b71976..8a2889a2 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/action/planner/ActionPlanner.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/action/planner/ActionPlanner.java @@ -1,6 +1,7 @@ package work.slhaf.partner.module.action.planner; import kotlin.Unit; +import lombok.extern.slf4j.Slf4j; import org.jetbrains.annotations.NotNull; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -37,6 +38,7 @@ import java.util.concurrent.atomic.AtomicBoolean; /** * 负责针对本次输入生成基础的行动计划 */ +@Slf4j public class ActionPlanner extends AbstractAgentModule.Running { private static final String IMMEDIATE_WATCHER_CRON = "0/5 * * * * ?"; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/action/scheduler/ActionScheduler.kt b/Partner-Core/src/main/java/work/slhaf/partner/module/action/scheduler/ActionScheduler.kt index fbd2943f..5ab37b7a 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/action/scheduler/ActionScheduler.kt +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/action/scheduler/ActionScheduler.kt @@ -287,7 +287,7 @@ class ActionScheduler : AbstractAgentModule.Standalone() { val now1 = System.nanoTime() val sleepNanos = nextTickNanos - now1 if (sleepNanos > 0) { - delay(sleepNanos / 1_000_000L) // 毫秒级 delay 足够;剩余 nanos 不必忙等 + delay((sleepNanos / 1_000_000L).milliseconds) // 毫秒级 delay 足够;剩余 nanos 不必忙等 } } } @@ -299,7 +299,7 @@ class ActionScheduler : AbstractAgentModule.Standalone() { ).toMillis() // withTimeoutOrNull 内部已处理 seconds 小于 0 的情况 log.debug("Start waiting {} ms at {}, target time: {}", seconds, currentTime, nextHour) - withTimeoutOrNull(seconds) { + withTimeoutOrNull(seconds.milliseconds) { state.first { it == WheelState.ACTIVE } } log.debug("Waiting ended at {}", ZonedDateTime.now()) diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/communication/CommunicationProducer.java b/Partner-Core/src/main/java/work/slhaf/partner/module/communication/CommunicationProducer.java index 4390c487..c6610939 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/communication/CommunicationProducer.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/communication/CommunicationProducer.java @@ -1,5 +1,6 @@ package work.slhaf.partner.module.communication; +import lombok.extern.slf4j.Slf4j; import org.jetbrains.annotations.NotNull; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -25,6 +26,7 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; +@Slf4j public class CommunicationProducer extends AbstractAgentModule.Running implements ActivateModel { private static final String INTERRUPTED_MARKER = " [response interrupted due to internal exception]"; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/communication/DialogRolling.java b/Partner-Core/src/main/java/work/slhaf/partner/module/communication/DialogRolling.java index bd39a441..8acdde35 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/communication/DialogRolling.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/communication/DialogRolling.java @@ -1,6 +1,7 @@ package work.slhaf.partner.module.communication; import kotlin.Unit; +import lombok.extern.slf4j.Slf4j; import org.jetbrains.annotations.NotNull; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -34,6 +35,7 @@ import java.util.List; import java.util.Set; import java.util.concurrent.atomic.AtomicBoolean; +@Slf4j public class DialogRolling extends AbstractAgentModule.Running { private static final String AUTO_UPDATE_CRON = "0/10 * * * * ?"; diff --git a/Partner-Core/src/main/java/work/slhaf/partner/module/memory/selector/MemorySelector.java b/Partner-Core/src/main/java/work/slhaf/partner/module/memory/selector/MemorySelector.java index a6b8756d..0854ed53 100644 --- a/Partner-Core/src/main/java/work/slhaf/partner/module/memory/selector/MemorySelector.java +++ b/Partner-Core/src/main/java/work/slhaf/partner/module/memory/selector/MemorySelector.java @@ -1,6 +1,7 @@ package work.slhaf.partner.module.memory.selector; import kotlin.Unit; +import lombok.extern.slf4j.Slf4j; import org.jetbrains.annotations.NotNull; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -24,6 +25,7 @@ import work.slhaf.partner.runtime.PartnerRunningFlowContext; import java.time.LocalDate; import java.util.*; +@Slf4j public class MemorySelector extends AbstractAgentModule.Running { private static final String BLOCK_NAME = "activated_memory_slices"; diff --git a/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/component/abstracts/AgentModule.kt b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/component/abstracts/AgentModule.kt index 68cac6ba..adc3f237 100644 --- a/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/component/abstracts/AgentModule.kt +++ b/Partner-Framework/src/main/java/work/slhaf/partner/framework/agent/factory/component/abstracts/AgentModule.kt @@ -1,7 +1,5 @@ package work.slhaf.partner.framework.agent.factory.component.abstracts -import org.slf4j.Logger -import org.slf4j.LoggerFactory import work.slhaf.partner.framework.agent.factory.component.annotation.AgentComponent import work.slhaf.partner.framework.agent.interaction.flow.RunningFlowContext import work.slhaf.partner.framework.agent.log.LogAdviceProvider @@ -15,9 +13,6 @@ sealed class AbstractAgentModule { var moduleName: String = javaClass.simpleName - @JvmField - val log: Logger = LoggerFactory.getLogger(javaClass.simpleName) - abstract class Running : AbstractAgentModule() { private val advice = run {