exo/lm-lib
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: Bump version to 1.6.13 and refactor execute method in BaseAgent for improved split handling

Browse Source
This commit is contained in:
extio-de
2025-09-22 19:49:08 +02:00
parent d17286a7f4
commit 103ff2cb40
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@@ -4,7 +4,7 @@
<artifactId>lm-lib</artifactId> <artifactId>lm-lib</artifactId>
<groupId>de.extio</groupId> <groupId>de.extio</groupId>
<name>lm-lib</name> <name>lm-lib</name>
<version>1.6.12</version> <version>1.6.13</version>
<properties> <properties>
<java.version>21</java.version> <java.version>21</java.version>

11
src/main/java/de/extio/lmlib/agent/BaseAgent.java
View File

@@ -71,13 +71,13 @@ public interface BaseAgent {
} }
default List<AgentContext> execute(final Client client, final ExecutorService agentExecutorService, final AgentContext context) { default List<AgentContext> execute(final Client client, final ExecutorService agentExecutorService, final AgentContext context) {
final var finishedSplits = Collections.synchronizedList(new ArrayList<Split>()); final var splits = new ArrayList<Split>();
context.setNextAgent(null); context.setNextAgent(null);
this.preProcess(context); this.preProcess(context);
final var splits = this.applyTemplate(context); splits.addAll(this.applyTemplate(context));
final var tasks = new ArrayList<CompletableFuture<?>>(splits.size()); final var tasks = new ArrayList<CompletableFuture<?>>(splits.size());
for (final var split : splits) { for (final var split : splits) {
tasks.add(CompletableFuture.runAsync(() -> { tasks.add(CompletableFuture.runAsync(() -> {
@@ -145,8 +145,6 @@ public interface BaseAgent {
if (split.context().getAgentContextUpdateConsumer() != null) { if (split.context().getAgentContextUpdateConsumer() != null) {
split.context().getAgentContextUpdateConsumer().accept(split.context()); split.context().getAgentContextUpdateConsumer().accept(split.context());
} }
finishedSplits.add(split);
} }
catch (final Exception ex) { catch (final Exception ex) {
LOGGER.error("Error during agent execution", ex); LOGGER.error("Error during agent execution", ex);
@@ -157,13 +155,12 @@ public interface BaseAgent {
CompletableFuture.allOf(tasks.toArray(new CompletableFuture[0])).join(); CompletableFuture.allOf(tasks.toArray(new CompletableFuture[0])).join();
var retContexts = finishedSplits var retContexts = splits
.stream() .stream()
.filter(s -> !s.context().isError()) .filter(s -> !s.context().isError())
.sorted((s0, s1) -> Integer.compare(s0.index(), s1.index())) .sorted((s0, s1) -> Integer.compare(s0.index(), s1.index()))
.map(Split::context) .map(Split::context)
.collect(Collectors.toCollection(ArrayList::new)); .collect(Collectors.toCollection(ArrayList::new));
if (!retContexts.isEmpty()) { if (!retContexts.isEmpty()) {
final var merged = this.merge(List.copyOf(retContexts)); final var merged = this.merge(List.copyOf(retContexts));
if (merged != null) { if (merged != null) {
@@ -177,7 +174,7 @@ public interface BaseAgent {
retContexts.forEach(this::nextAgent); retContexts.forEach(this::nextAgent);
} }
retContexts.addAll(finishedSplits.stream().filter(s -> s.context().isError()).map(s -> s.context()).toList()); retContexts.addAll(splits.stream().filter(s -> s.context().isError()).map(s -> s.context()).toList());
return retContexts; return retContexts;
} }